diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-02-10 07:45:43 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-02-10 07:45:43 +0000 |
| commit | 476c4db3dc56bee43df384704c75ccc71cfa7a1d (patch) | |
| tree | 5d0dcec3cc12fc53532fc84029892b98711a2596 /test/asan/android_commands | |
| parent | ca9211ecdede9bdedb812b2243a4abdb8dacd1b9 (diff) | |
| download | src-476c4db3dc56bee43df384704c75ccc71cfa7a1d.tar.gz src-476c4db3dc56bee43df384704c75ccc71cfa7a1d.zip | |
Import compiler-rt trunk r228651.vendor/compiler-rt/compiler-rt-r228651
Notes
Notes:
svn path=/vendor/compiler-rt/dist/; revision=278497
svn path=/vendor/compiler-rt/compiler-rt-r228651/; revision=278498; tag=vendor/compiler-rt/compiler-rt-r228651
Diffstat (limited to 'test/asan/android_commands')
| -rwxr-xr-x | test/asan/android_commands/android_run.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/asan/android_commands/android_run.py b/test/asan/android_commands/android_run.py index 7f8c612a0cf0..621844fd30a2 100755 --- a/test/asan/android_commands/android_run.py +++ b/test/asan/android_commands/android_run.py @@ -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) |