summaryrefslogtreecommitdiff
path: root/lib/asan
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2017-07-11 18:18:50 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2017-07-11 18:18:50 +0000
commit093a9f1fc68d3adff00f60983971bd1893907298 (patch)
tree0cf100a7c354801b5f3c7b736cdf44994f30d94b /lib/asan
parent5b62d82e70980e8918f40e692d5bff572dbcad02 (diff)
[asan] Fix asan_device_setup --use-su mode on Android 7.x.
mount command does not accept -o remount,rw flag on some versions of Android. mount -o rw,remount works everywhere. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@307685 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan')
-rwxr-xr-xlib/asan/scripts/asan_device_setup2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/asan/scripts/asan_device_setup b/lib/asan/scripts/asan_device_setup
index 79ac2f916..5a4f7c47c 100755
--- a/lib/asan/scripts/asan_device_setup
+++ b/lib/asan/scripts/asan_device_setup
@@ -52,7 +52,7 @@ function adb_remount {
local STORAGE=`$ADB shell mount | grep /system | cut -d ' ' -f1`
if [ "$STORAGE" != "" ]; then
echo Remounting $STORAGE at /system
- $ADB shell su -c "mount -o remount,rw $STORAGE /system"
+ $ADB shell su -c "mount -o rw,remount $STORAGE /system"
else
echo Failed to get storage device name for "/system" mount point
fi