summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib/asan/scripts/asan_device_setup
diff options
context:
space:
mode:
Diffstat (limited to 'compiler-rt/lib/asan/scripts/asan_device_setup')
-rwxr-xr-xcompiler-rt/lib/asan/scripts/asan_device_setup5
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler-rt/lib/asan/scripts/asan_device_setup b/compiler-rt/lib/asan/scripts/asan_device_setup
index c807df3cd25..fdfc46f6e5b 100755
--- a/compiler-rt/lib/asan/scripts/asan_device_setup
+++ b/compiler-rt/lib/asan/scripts/asan_device_setup
@@ -327,6 +327,11 @@ exec $_to \$@
EOF
}
+# On Android-L not allowing user segv handler breaks some applications.
+if [[ PRE_L -eq 0 ]]; then
+ ASAN_OPTIONS="$ASAN_OPTIONS,allow_user_segv_handler=1"
+fi
+
if [[ x$extra_options != x ]] ; then
ASAN_OPTIONS="$ASAN_OPTIONS,$extra_options"
fi
OpenPOWER on IntegriCloud