From 919e85ae056a238789af6bb2d7b34fe9fdde4ebb Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sat, 20 Jan 2018 19:56:51 +0100 Subject: 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 TryBot-Result: Gobot Gobot Reviewed-by: Hyang-Ah Hana Kim --- src/androidtest.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/androidtest.bash') 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 '' -- cgit v1.3