diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-09-11 12:20:29 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-09-11 12:20:29 +0000 |
| commit | e579c76bd57eb7d24111d6d52ed1f5d3e4006b64 (patch) | |
| tree | 6ad029d6d6f425f05566342439b125ca3db3018b | |
| parent | f605184180484c866544a53a5aa9865f9db54245 (diff) | |
| download | bcm5719-llvm-e579c76bd57eb7d24111d6d52ed1f5d3e4006b64.tar.gz bcm5719-llvm-e579c76bd57eb7d24111d6d52ed1f5d3e4006b64.zip | |
[asan] Preserve existing LD_PRELOAD setting on Android.
llvm-svn: 217584
| -rwxr-xr-x | compiler-rt/lib/asan/scripts/asan_device_setup | 2 |
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 cb87f690248..868811fad05 100755 --- a/compiler-rt/lib/asan/scripts/asan_device_setup +++ b/compiler-rt/lib/asan/scripts/asan_device_setup @@ -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 |
