[compiler-rt] r200382 - [asan] Fix asan_device_setup.sh failure on userdebug Android.

[Evgeniy Stepanov]

Author: eugenis
Date: Wed Jan 29 03:16:48 2014
New Revision: 200382

URL: http://llvm.org/viewvc/llvm-project?rev=200382&view=rev
Log:
[asan] Fix asan_device_setup.sh failure on userdebug Android.

Modified:
    compiler-rt/trunk/lib/asan/scripts/asan_device_setup.sh

Modified: compiler-rt/trunk/lib/asan/scripts/asan_device_setup.sh
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/scripts/asan_device_setup.sh?rev=200382&r1=200381&r2=200382&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/scripts/asan_device_setup.sh (original)
+++ compiler-rt/trunk/lib/asan/scripts/asan_device_setup.sh Wed Jan 29 03:16:48 2014
@@ -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'