summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-01-29 09:16:48 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-01-29 09:16:48 +0000
commit422944fdbd415f5e3466247a849a05decec16489 (patch)
treee54c80dd10bf7f1f1894ba7d45c0ed71d976206f
parent14bd917470dab03e3a77b16225c88c492e6d84bb (diff)
downloadbcm5719-llvm-422944fdbd415f5e3466247a849a05decec16489.tar.gz
bcm5719-llvm-422944fdbd415f5e3466247a849a05decec16489.zip
[asan] Fix asan_device_setup.sh failure on userdebug Android.
llvm-svn: 200382
-rwxr-xr-xcompiler-rt/lib/asan/scripts/asan_device_setup.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler-rt/lib/asan/scripts/asan_device_setup.sh b/compiler-rt/lib/asan/scripts/asan_device_setup.sh
index eeb64f3c974..25fb26af9f0 100755
--- a/compiler-rt/lib/asan/scripts/asan_device_setup.sh
+++ b/compiler-rt/lib/asan/scripts/asan_device_setup.sh
@@ -75,6 +75,7 @@ ASAN_RT="libclang_rt.asan-arm-android.so"
if [[ x$revert == xyes ]]; then
echo '>> Uninstalling ASan'
$ADB root
+ $ADB wait-for-device
$ADB remount
$ADB shell mv /system/bin/app_process.real /system/bin/app_process
$ADB shell rm /system/bin/asanwrapper
@@ -115,6 +116,7 @@ mkdir "$TMPDIROLD"
echo '>> Remounting /system rw'
$ADB root
+$ADB wait-for-device
$ADB remount
echo '>> Copying files from the device'
OpenPOWER on IntegriCloud