summaryrefslogtreecommitdiffstats
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
commitb76e4d12f46da43369f113712f73685b6c4a0d6f (patch)
treeed1c71cdabd9f79411d2167df804dce3594ca3e2
parent3d5ea713f7d5a824e091adcf81a3d9fc38010d03 (diff)
downloadbcm5719-llvm-b76e4d12f46da43369f113712f73685b6c4a0d6f.tar.gz
bcm5719-llvm-b76e4d12f46da43369f113712f73685b6c4a0d6f.zip
[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. llvm-svn: 307685
-rwxr-xr-xcompiler-rt/lib/asan/scripts/asan_device_setup2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/asan/scripts/asan_device_setup b/compiler-rt/lib/asan/scripts/asan_device_setup
index 79ac2f91656..5a4f7c47cc2 100755
--- a/compiler-rt/lib/asan/scripts/asan_device_setup
+++ b/compiler-rt/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
OpenPOWER on IntegriCloud