[compiler-rt] r217584 - [asan] Preserve existing LD_PRELOAD setting on Android.

[Evgeniy Stepanov]

Author: eugenis
Date: Thu Sep 11 07:20:29 2014
New Revision: 217584

URL: http://llvm.org/viewvc/llvm-project?rev=217584&view=rev
Log:
[asan] Preserve existing LD_PRELOAD setting on Android.

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=217584&r1=217583&r2=217584&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/scripts/asan_device_setup (original)
+++ compiler-rt/trunk/lib/asan/scripts/asan_device_setup Thu Sep 11 07:20:29 2014
@@ -168,7 +168,7 @@ fi
 cat <<EOF >"$TMPDIR/app_process.wrap"
 #!/system/bin/sh
 ASAN_OPTIONS=$ASAN_OPTIONS \\
-LD_PRELOAD=libclang_rt.asan-arm-android.so \\
+LD_PRELOAD=\$LD_PRELOAD:libclang_rt.asan-arm-android.so \\
 exec /system/bin/app_process32 \$@
 
 EOF