[compiler-rt] r305746 - [asan] Fix android setup script to overwrite the symlink.

Evgeniy Stepanov via llvm-commits llvm-commits at lists.llvm.org
Mon Jun 19 14:42:45 PDT 2017


Author: eugenis
Date: Mon Jun 19 16:42:44 2017
New Revision: 305746

URL: http://llvm.org/viewvc/llvm-project?rev=305746&view=rev
Log:
[asan] Fix android setup script to overwrite the symlink.

This fixes asan_device_setup failing to update an existing asan
installation.

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

Modified: compiler-rt/trunk/lib/asan/scripts/asan_device_setup
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/scripts/asan_device_setup?rev=305746&r1=305745&r2=305746&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/scripts/asan_device_setup (original)
+++ compiler-rt/trunk/lib/asan/scripts/asan_device_setup Mon Jun 19 16:42:44 2017
@@ -410,15 +410,15 @@ if ! ( cd "$TMPDIRBASE" && diff -qr old/
       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




More information about the llvm-commits mailing list