[compiler-rt] r301256 - [asan] Remove asanwrapper from Android test harness.

[Evgeniy Stepanov via llvm-commits]

Author: eugenis
Date: Mon Apr 24 16:27:45 2017
New Revision: 301256

URL: http://llvm.org/viewvc/llvm-project?rev=301256&view=rev
Log:
[asan] Remove asanwrapper from Android test harness.

It is only necessary for pre-L and creates problems on newer builds.

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=301256&r1=301255&r2=301256&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/android_commands/android_run.py (original)
+++ compiler-rt/trunk/test/asan/android_commands/android_run.py Mon Apr 24 16:27:45 2017
@@ -18,15 +18,14 @@ def build_env():
     return ' '.join(args)
 
 is_64bit = (subprocess.check_output(['file', sys.argv[0] + '.real']).find('64-bit') != -1)
-asanwrapper = "" if is_64bit else "asanwrapper "
 
 device_env = build_env()
 device_args = ' '.join(sys.argv[1:]) # FIXME: escape?
 device_stdout = device_binary + '.stdout'
 device_stderr = device_binary + '.stderr'
 device_exitcode = device_binary + '.exitcode'
-ret = adb(['shell', 'cd %s && %s %s%s %s >%s 2>%s ; echo $? >%s' %
-           (ANDROID_TMPDIR, device_env, asanwrapper, device_binary, device_args,
+ret = adb(['shell', 'cd %s && %s %s %s >%s 2>%s ; echo $? >%s' %
+           (ANDROID_TMPDIR, device_env, device_binary, device_args,
             device_stdout, device_stderr, device_exitcode)])
 if ret != 0:
     sys.exit(ret)