diff options
| author | Elias Naur <mail@eliasnaur.com> | 2019-02-24 13:18:13 +0100 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2019-02-26 17:59:23 +0000 |
| commit | da2d02a9356f2d808992990510eca2b26513be0c (patch) | |
| tree | d8dcafc1ad0377ee711e07bfa85cc7a9f58ae365 /src/androidtest.bash | |
| parent | 42a82ce1a7051b3a2762bff73b6eda4797e0fd4b (diff) | |
| download | go-da2d02a9356f2d808992990510eca2b26513be0c.tar.xz | |
cmd/dist: build exec wrappers during bootstrap
The androidtest.bash script encodes the additional steps to build
Go and run tests on Android. In order to add sharded builders and
trybots, Android needs to fit into the usual make.bash + cmd/dist test
pattern.
This change moves building the exec wrapper into cmd/dist bootstrap.
Do the same for iOS while we're here.
Updates #23824
Change-Id: I58a1b0679c3a6c92fdc7fff464b469641f1fee74
Reviewed-on: https://go-review.googlesource.com/c/163618
Run-TryBot: Elias Naur <mail@eliasnaur.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/androidtest.bash')
| -rwxr-xr-x | src/androidtest.bash | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/androidtest.bash b/src/androidtest.bash index e43b89c0dc..12f240cc58 100755 --- a/src/androidtest.bash +++ b/src/androidtest.bash @@ -31,14 +31,11 @@ fi export CGO_ENABLED=1 unset GOBIN -# Do the build first, so we can build go_android_exec and cleaner. +# Do the build first, so we can build the 'cleaner' binary. # Also lets us fail early before the (slow) adb push if the build is broken. . ./make.bash --no-banner export GOROOT=$(dirname $(pwd)) export PATH=$GOROOT/bin:$PATH -GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH go build \ - -o ../bin/go_android_${GOARCH}_exec \ - ../misc/android/go_android_exec.go export pkgdir=$(dirname $(go list -f '{{.Target}}' runtime)) if [ "$pkgdir" = "" ]; then |