diff options
| author | Josh Bleecher Snyder <josharian@gmail.com> | 2016-08-28 08:56:06 -0700 |
|---|---|---|
| committer | Josh Bleecher Snyder <josharian@gmail.com> | 2016-08-29 15:24:30 +0000 |
| commit | 6dd0b2d70292fc57e5664e2806f1d46cd621f531 (patch) | |
| tree | 5e9ca0f36046edba3131de8563b363e4effbade4 /src/androidtest.bash | |
| parent | 8dd069b52a87d482e219e16e92390b1d415db486 (diff) | |
| download | go-6dd0b2d70292fc57e5664e2806f1d46cd621f531.tar.xz | |
androidtest.bash: fix pkg dir
CL 24930 altered the default InstallSuffix
for mobile platforms.
Update androidtest.bash to reflect this.
This reverts CL 16151.
A subsequent CL will make this more robust,
but it will take more discussion and review.
In the meantime, this fixes the build.
Change-Id: Ia19ca2c9bab7b79c9cf24beeca64ecddaa60289c
Reviewed-on: https://go-review.googlesource.com/27927
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Elias Naur <elias.naur@gmail.com>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
Diffstat (limited to 'src/androidtest.bash')
| -rwxr-xr-x | src/androidtest.bash | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/androidtest.bash b/src/androidtest.bash index a11165bbc5..c76882d9db 100755 --- a/src/androidtest.bash +++ b/src/androidtest.bash @@ -68,15 +68,7 @@ mkdir -p $FAKE_GOROOT/pkg cp -a "${GOROOT}/src" "${FAKE_GOROOT}/" cp -a "${GOROOT}/test" "${FAKE_GOROOT}/" cp -a "${GOROOT}/lib" "${FAKE_GOROOT}/" - -# For android, the go tool will install the compiled package in -# pkg/android_${GOARCH}_shared directory by default, not in -# the usual pkg/${GOOS}_${GOARCH}. Some tests in src/go/* assume -# the compiled packages were installed in the usual places. -# Instead of reflecting this exception into the go/* packages, -# we copy the compiled packages into the usual places. -cp -a "${GOROOT}/pkg/android_${GOARCH}_shared" "${FAKE_GOROOT}/pkg/" -mv "${FAKE_GOROOT}/pkg/android_${GOARCH}_shared" "${FAKE_GOROOT}/pkg/android_${GOARCH}" +cp -a "${GOROOT}/pkg/android_$GOARCH" "${FAKE_GOROOT}/pkg/" echo '# Syncing test files to android device' adb shell mkdir -p /data/local/tmp/goroot |