From da2d02a9356f2d808992990510eca2b26513be0c Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sun, 24 Feb 2019 13:18:13 +0100 Subject: 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 TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- src/androidtest.bash | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/androidtest.bash') 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 -- cgit v1.3