diff options
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 |