[asan] Support ASAN_ACTIVATION_OPTIONS.

This is mostly useful for testing, as the only other way of specifying
activation options (Android system property) is system-wide and affects
concurrently running tests.

llvm-svn: 224824

1 files changed, 6 insertions, 0 deletions

diff --git a/compiler-rt/lib/asan/asan_activation.cc b/compiler-rt/lib/asan/asan_activation.cc
index 010cf319bda..0aca1cb4e86 100644
--- a/compiler-rt/lib/asan/asan_activation.cc
+++ b/compiler-rt/lib/asan/asan_activation.cc
@@ -39,6 +39,12 @@ static struct AsanDeactivatedFlags {
     // Check if activation flags need to be overriden.
     // FIXME: Add diagnostic to check that activation flags string doesn't
     // contain any other flags.
+    if (const char *env = GetEnv("ASAN_ACTIVATION_OPTIONS")) {
+      cf.ParseFromString(env);
+      ParseFlagsFromString(&f, env);
+    }
+
+    // Override from getprop asan.options.
     char buf[100];
     GetExtraActivationFlags(buf, sizeof(buf));
     cf.ParseFromString(buf);