[compiler-rt] r243494 - [asan] Support per-application flags in the Android setup script.

[Evgeniy Stepanov]

Author: eugenis
Date: Tue Jul 28 17:45:24 2015
New Revision: 243494

URL: http://llvm.org/viewvc/llvm-project?rev=243494&view=rev
Log:
[asan] Support per-application flags in the Android setup script.

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=243494&r1=243493&r2=243494&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/scripts/asan_device_setup (original)
+++ compiler-rt/trunk/lib/asan/scripts/asan_device_setup Tue Jul 28 17:45:24 2015
@@ -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 \$@