maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[asan] Control location of symbolizer on device using ANDROID_SYMBOLIZER_PATH" 

Not needed, I am going to put symbolizer into tests dir.

This reverts commit r306627.

llvm-svn: 306630
This commit is contained in:
Vitaly Buka 2017-06-29 02:48:06 +00:00
parent eb615506b3
commit 1631129834
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler-rt/test/asan/android_commands/android_run.py
View File

@ -4,7 +4,6 @@ import os, signal, sys, subprocess, tempfile
from android_common import * from android_common import *
ANDROID_TMPDIR = '/data/local/tmp/Output' 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])) here = os.path.abspath(os.path.dirname(sys.argv[0]))
device_binary = os.path.join(ANDROID_TMPDIR, os.path.basename(sys.argv[0])) device_binary = os.path.join(ANDROID_TMPDIR, os.path.basename(sys.argv[0]))
@ -13,8 +12,6 @@ def build_env():
args = [] args = []
# Android linker ignores RPATH. Set LD_LIBRARY_PATH to Output dir. # Android linker ignores RPATH. Set LD_LIBRARY_PATH to Output dir.
args.append('LD_LIBRARY_PATH=%s' % (ANDROID_TMPDIR,)) 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(): for (key, value) in os.environ.items():
if key in ['ASAN_OPTIONS', 'ASAN_ACTIVATION_OPTIONS']: if key in ['ASAN_OPTIONS', 'ASAN_ACTIVATION_OPTIONS']:
args.append('%s="%s"' % (key, value)) args.append('%s="%s"' % (key, value))