From 8e36aa6e0222f28d9fe090e1d065340c7fc556b3 Mon Sep 17 00:00:00 2001
From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
Date: Tue, 28 Jul 2015 22:45:24 +0000
Subject: [PATCH] [asan] Support per-application flags in the Android setup
 script.

llvm-svn: 243494
---
 compiler-rt/lib/asan/scripts/asan_device_setup | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compiler-rt/lib/asan/scripts/asan_device_setup b/compiler-rt/lib/asan/scripts/asan_device_setup
index 104e07b..a9353f4 100755
--- a/compiler-rt/lib/asan/scripts/asan_device_setup
+++ b/compiler-rt/lib/asan/scripts/asan_device_setup
@@ -273,6 +273,7 @@ fi
 cat <<EOF >"$TMPDIR/app_process.wrap"
 #!/system/bin/sh-from-zygote
 ASAN_OPTIONS=$ASAN_OPTIONS \\
+ASAN_ACTIVATION_OPTIONS=include_if_exists=/data/local/tmp/asan.options.%b \\
 LD_PRELOAD=\$LD_PRELOAD:$ASAN_RT \\
 exec /system/bin/app_process32 \$@
 
-- 
2.7.4