[compiler-rt] r226273 - [asan] Change detection of allow_user_segv_handler on Android.

[Evgeniy Stepanov]

Author: eugenis
Date: Fri Jan 16 07:12:22 2015
New Revision: 226273

URL: http://llvm.org/viewvc/llvm-project?rev=226273&view=rev
Log:
[asan] Change detection of allow_user_segv_handler 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=226273&r1=226272&r2=226273&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/scripts/asan_device_setup (original)
+++ compiler-rt/trunk/lib/asan/scripts/asan_device_setup Fri Jan 16 07:12:22 2015
@@ -184,7 +184,7 @@ cp "$ASAN_RT_PATH/$ASAN_RT" "$TMPDIR/"
 ASAN_OPTIONS=start_deactivated=1,alloc_dealloc_mismatch=0
 
 # On Android-L not allowing user segv handler breaks some applications.
-if $ADB shell 'echo $LD_PRELOAD' | grep libsigchain.so >&/dev/null; then
+if [[ PRE_L -eq 0 ]]; then
     ASAN_OPTIONS="$ASAN_OPTIONS,allow_user_segv_handler=1"
 fi