[compiler-rt] r225636 - [asan] Pass activation options in the android test runner.

[Evgeniy Stepanov]

Author: eugenis
Date: Mon Jan 12 11:10:05 2015
New Revision: 225636

URL: http://llvm.org/viewvc/llvm-project?rev=225636&view=rev
Log:
[asan] Pass activation options in the android test runner.

Modified:
    compiler-rt/trunk/test/asan/android_commands/android_run.py

Modified: compiler-rt/trunk/test/asan/android_commands/android_run.py
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/android_commands/android_run.py?rev=225636&r1=225635&r2=225636&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/android_commands/android_run.py (original)
+++ compiler-rt/trunk/test/asan/android_commands/android_run.py Mon Jan 12 11:10:05 2015
@@ -14,7 +14,7 @@ def build_env():
     args.append('LD_LIBRARY_PATH=%s:%s' %
                 (ANDROID_TMPDIR, os.environ.get('LD_LIBRARY_PATH', '')))
     for (key, value) in os.environ.items():
-        if key in ['ASAN_OPTIONS']:
+        if key in ['ASAN_OPTIONS', 'ASAN_ACTIVATION_OPTIONS']:
             args.append('%s="%s"' % (key, value))
     return ' '.join(args)