From 1631129834a06f5a1438288fd25fc984fc40862d Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Thu, 29 Jun 2017 02:48:06 +0000 Subject: [PATCH] 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 --- compiler-rt/test/asan/android_commands/android_run.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/compiler-rt/test/asan/android_commands/android_run.py b/compiler-rt/test/asan/android_commands/android_run.py index fc020f793d5a..7e599453d1c4 100755 --- a/compiler-rt/test/asan/android_commands/android_run.py +++ b/compiler-rt/test/asan/android_commands/android_run.py @@ -4,7 +4,6 @@ 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])) @@ -13,8 +12,6 @@ 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))