From 26124030a051b6b05a29349fdc4b92880e18c8a8 Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Sun, 28 Aug 2016 09:03:08 -0700 Subject: [PATCH] androidtest.bash: use go list to get pkg dir This will be more robust in the faces of future changes to the pkg dir layout. Change-Id: Iaf078093f02ef3a10884a19c25e2068cbbf5f36a Reviewed-on: https://go-review.googlesource.com/27929 Reviewed-by: Brad Fitzpatrick Reviewed-by: David Crawshaw --- src/androidtest.bash | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/androidtest.bash b/src/androidtest.bash index c76882d9db..3ac56d1745 100755 --- a/src/androidtest.bash +++ b/src/androidtest.bash @@ -47,6 +47,12 @@ 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 + echo "could not find android pkg dir" 1>&2 + exit 1 +fi + export ANDROID_TEST_DIR=/tmp/androidtest-$$ function cleanup() { @@ -68,7 +74,7 @@ mkdir -p $FAKE_GOROOT/pkg cp -a "${GOROOT}/src" "${FAKE_GOROOT}/" cp -a "${GOROOT}/test" "${FAKE_GOROOT}/" cp -a "${GOROOT}/lib" "${FAKE_GOROOT}/" -cp -a "${GOROOT}/pkg/android_$GOARCH" "${FAKE_GOROOT}/pkg/" +cp -a "${pkgdir}" "${FAKE_GOROOT}/pkg/" echo '# Syncing test files to android device' adb shell mkdir -p /data/local/tmp/goroot -- 2.48.1