summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib/asan/scripts/asan_device_setup
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-10-06 12:45:39 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-10-06 12:45:39 +0000
commitfaef77480d0ff27dca79b4a60f6863bf97d30854 (patch)
tree9cca3646210789599991865c40cfc8b32b045c4c /compiler-rt/lib/asan/scripts/asan_device_setup
parentd2a3f4765b19254a705e4a8c7bee4af0f5a120f7 (diff)
downloadbcm5719-llvm-faef77480d0ff27dca79b4a60f6863bf97d30854.tar.gz
bcm5719-llvm-faef77480d0ff27dca79b4a60f6863bf97d30854.zip
[asan] Minor tweak to asan_device_setup.
Add another wait-for-device which may fix a flaky setup error. Fix output message. llvm-svn: 219117
Diffstat (limited to 'compiler-rt/lib/asan/scripts/asan_device_setup')
-rwxr-xr-xcompiler-rt/lib/asan/scripts/asan_device_setup3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler-rt/lib/asan/scripts/asan_device_setup b/compiler-rt/lib/asan/scripts/asan_device_setup
index b36c85791fc..a620f51b083 100755
--- a/compiler-rt/lib/asan/scripts/asan_device_setup
+++ b/compiler-rt/lib/asan/scripts/asan_device_setup
@@ -90,9 +90,10 @@ echo '>> Remounting /system rw'
$ADB root
$ADB wait-for-device
$ADB remount
+$ADB wait-for-device
get_device_arch ARCH
-echo 'Target architecture: $ARCH'
+echo "Target architecture: $ARCH"
ASAN_RT="libclang_rt.asan-$ARCH-android.so"
if [[ x$revert == xyes ]]; then
OpenPOWER on IntegriCloud