summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorVitaly Buka <vitalybuka@google.com>2017-06-29 01:04:32 +0000
committerVitaly Buka <vitalybuka@google.com>2017-06-29 01:04:32 +0000
commit02c4d3f8b403a2bc2e20a8d95e1c6fc533209ab4 (patch)
tree1c6f493b9c50849fa5e7406a62821370594a703a /test
parent81300751ef926596153f5d8db0b3057b6d169a03 (diff)
[asan] Control location of symbolizer on device using ANDROID_SYMBOLIZER_PATH
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@306627 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
-rwxr-xr-xtest/asan/android_commands/android_run.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/asan/android_commands/android_run.py b/test/asan/android_commands/android_run.py
index 7e599453d..fc020f793 100755
--- a/test/asan/android_commands/android_run.py
+++ b/test/asan/android_commands/android_run.py
@@ -4,6 +4,7 @@ import os, signal, sys, subprocess, tempfile
from android_common import *
ANDROID_TMPDIR = '/data/local/tmp/Output'
+ANDROID_SYMBOLIZER_PATH = os.environ.get('ANDROID_SYMBOLIZER_PATH', None)
here = os.path.abspath(os.path.dirname(sys.argv[0]))
device_binary = os.path.join(ANDROID_TMPDIR, os.path.basename(sys.argv[0]))
@@ -12,6 +13,8 @@ def build_env():
args = []
# Android linker ignores RPATH. Set LD_LIBRARY_PATH to Output dir.
args.append('LD_LIBRARY_PATH=%s' % (ANDROID_TMPDIR,))
+ if ANDROID_SYMBOLIZER_PATH:
+ args.append('ASAN_SYMBOLIZER_PATH=%s' % (ANDROID_SYMBOLIZER_PATH))
for (key, value) in os.environ.items():
if key in ['ASAN_OPTIONS', 'ASAN_ACTIVATION_OPTIONS']:
args.append('%s="%s"' % (key, value))