diff options
| author | Elias Naur <elias.naur@gmail.com> | 2018-01-20 19:56:51 +0100 |
|---|---|---|
| committer | Elias Naur <elias.naur@gmail.com> | 2018-01-20 21:13:30 +0000 |
| commit | 919e85ae056a238789af6bb2d7b34fe9fdde4ebb (patch) | |
| tree | 6cf0adb52c28e6e4cfa8ff89ee1b803e54141dd4 /src/androidtest.bash | |
| parent | 3810f5bfed72d401b5b78b6b1e281d671c599606 (diff) | |
| download | go-919e85ae056a238789af6bb2d7b34fe9fdde4ebb.tar.xz | |
misc,src: add support for specifying adb flags to the android harness
Introduce GOANDROID_ADB_FLAGS for additional flags to adb invocations.
With GOANDROID_ADG_FLAGS, the Android builders can distinguish between
emulator and device builds.
Change-Id: I11729926a523ee27f6a3795cb2cfb64a9454f0a5
Reviewed-on: https://go-review.googlesource.com/88795
Run-TryBot: Elias Naur <elias.naur@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
Diffstat (limited to 'src/androidtest.bash')
| -rwxr-xr-x | src/androidtest.bash | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/androidtest.bash b/src/androidtest.bash index 3ac56d1745..a790f95920 100755 --- a/src/androidtest.bash +++ b/src/androidtest.bash @@ -77,8 +77,8 @@ cp -a "${GOROOT}/lib" "${FAKE_GOROOT}/" cp -a "${pkgdir}" "${FAKE_GOROOT}/pkg/" echo '# Syncing test files to android device' -adb shell mkdir -p /data/local/tmp/goroot -time adb sync data &> /dev/null +adb $GOANDROID_ADB_FLAGS shell mkdir -p /data/local/tmp/goroot +time adb $GOANDROID_ADB_FLAGS sync data &> /dev/null export CLEANER=${ANDROID_TEST_DIR}/androidcleaner-$$ cp ../misc/android/cleaner.go $CLEANER.go @@ -86,8 +86,8 @@ echo 'var files = `' >> $CLEANER.go (cd $ANDROID_PRODUCT_OUT/data/local/tmp/goroot; find . >> $CLEANER.go) echo '`' >> $CLEANER.go go build -o $CLEANER $CLEANER.go -adb push $CLEANER /data/local/tmp/cleaner -adb shell /data/local/tmp/cleaner +adb $GOANDROID_ADB_FLAGS push $CLEANER /data/local/tmp/cleaner +adb $GOANDROID_ADB_FLAGS shell /data/local/tmp/cleaner echo '' |