[compiler-rt] r306627 - [asan] Control location of symbolizer on device using ANDROID_SYMBOLIZER_PATH

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Wed Jun 28 18:04:32 2017
New Revision: 306627

URL: http://llvm.org/viewvc/llvm-project?rev=306627&view=rev
Log:
[asan] Control location of symbolizer on device using ANDROID_SYMBOLIZER_PATH

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=306627&r1=306626&r2=306627&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/android_commands/android_run.py (original)
+++ compiler-rt/trunk/test/asan/android_commands/android_run.py Wed Jun 28 18:04:32 2017
@@ -4,6 +4,7 @@ import os, signal, sys, subprocess, temp
 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))