Skip to content

Commit 5ad6703

Browse files
committed
android ci: target internal/ and enable its x86_64 export preset
The android workflow defaulted to testing/, which is gitignored (absent on CI). Use internal/ — the same tracked project the web job runs — and flip its Android export preset to x86_64 so pickAndroidPreset resolves for android/amd64 and the export matches the single libandroid_amd64.so we build.
1 parent 4202c81 commit 5ad6703

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

startup/internal/androidtest/run_android_tests.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
# See the caveats on Android.Test in cmd/gd/internal/builder/android.go — expect
1111
# to iterate on the user-dir/run-as path and arg passthrough on the first runs.
1212
#
13-
# Env: PROJECT_DIR (default <repo>/testing), GD (prebuilt gd binary), GOARCH.
13+
# Env: PROJECT_DIR (default <repo>/internal — tracked, has an x86_64 Android
14+
# preset), GD (prebuilt gd binary), GOARCH.
1415
set -euo pipefail
1516

1617
HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
1718
REPO="${REPO:-$(git -C "$HERE" rev-parse --show-toplevel)}"
18-
PROJECT_DIR="${PROJECT_DIR:-$REPO/testing}"
19+
PROJECT_DIR="${PROJECT_DIR:-$REPO/internal}"
1920
GOARCH="${GOARCH:-amd64}"
2021
GD="${GD:-}"
2122

0 commit comments

Comments
 (0)