From: David Crawshaw <crawshaw@golang.org>
Date: Wed, 8 Apr 2015 13:28:05 +0000 (-0400)
Subject: androidtest.bash: copy pkg for gcimporter tests
X-Git-Tag: go1.5beta1~1248
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=68f57c83274c0f30b94a6adc1668fe034b5780f2;p=gostls13.git

androidtest.bash: copy pkg for gcimporter tests

The tests for go/types depend on reading gc export data from the
$GOROOT/pkg directory. This is the first use of these files as
testdata, so previously they were not copied to the android device.
Now they are used, copy them.

Fixes android/arm build.

Change-Id: If13bbe603ce0aff697a73a97ae9a7d6b3ea800f9
Reviewed-on: https://go-review.googlesource.com/8624
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/androidtest.bash b/src/androidtest.bash
index ee97e30d58..aad1f7ec8d 100755
--- a/src/androidtest.bash
+++ b/src/androidtest.bash
@@ -44,9 +44,11 @@ GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH go build \
 export ANDROID_PRODUCT_OUT=/tmp/androidtest-$$
 FAKE_GOROOT=$ANDROID_PRODUCT_OUT/data/local/tmp/goroot
 mkdir -p $FAKE_GOROOT
+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/"
 echo '# Syncing test files to android device'
 time adb sync data &> /dev/null
 echo ''