From faef77480d0ff27dca79b4a60f6863bf97d30854 Mon Sep 17 00:00:00 2001
From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
Date: Mon, 6 Oct 2014 12:45:39 +0000
Subject: [PATCH] [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
---
 compiler-rt/lib/asan/scripts/asan_device_setup | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler-rt/lib/asan/scripts/asan_device_setup b/compiler-rt/lib/asan/scripts/asan_device_setup
index b36c85791fc8..a620f51b0836 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