diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-06-19 21:42:44 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-06-19 21:42:44 +0000 |
| commit | 9cbbe014c4d99e31fce00f40cfbecf3799872d2e (patch) | |
| tree | 45f69411ff7ad6ed5960a7b5657b1844c6888e84 | |
| parent | e9f87b734244609f83ee0d66cb34688acae9d643 (diff) | |
[asan] Fix android setup script to overwrite the symlink.
This fixes asan_device_setup failing to update an existing asan
installation.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@305746 91177308-0d34-0410-b5e6-96231b3b80d8
| -rwxr-xr-x | lib/asan/scripts/asan_device_setup | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/asan/scripts/asan_device_setup b/lib/asan/scripts/asan_device_setup index c807df3cd..79ac2f916 100755 --- a/lib/asan/scripts/asan_device_setup +++ b/lib/asan/scripts/asan_device_setup @@ -410,15 +410,15 @@ if ! ( cd "$TMPDIRBASE" && diff -qr old/ new/ ) ; then install "$TMPDIR/asanwrapper" /system/bin 755 install "$TMPDIR/asanwrapper64" /system/bin 755 - adb_shell ln -s $ASAN_RT /system/lib/$ASAN_RT_SYMLINK - adb_shell ln -s $ASAN_RT64 /system/lib64/$ASAN_RT_SYMLINK + adb_shell ln -sf $ASAN_RT /system/lib/$ASAN_RT_SYMLINK + adb_shell ln -sf $ASAN_RT64 /system/lib64/$ASAN_RT_SYMLINK else install "$TMPDIR/$ASAN_RT" /system/lib 644 install "$TMPDIR/app_process32" /system/bin 755 $CTX install "$TMPDIR/app_process.wrap" /system/bin 755 $CTX install "$TMPDIR/asanwrapper" /system/bin 755 $CTX - adb_shell ln -s $ASAN_RT /system/lib/$ASAN_RT_SYMLINK + adb_shell ln -sf $ASAN_RT /system/lib/$ASAN_RT_SYMLINK adb_shell rm /system/bin/app_process adb_shell ln -s /system/bin/app_process.wrap /system/bin/app_process |