Support running Android apk-based tests under ASan.

build/android/pylib/valgrind_tools.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Classes in this file define additional actions that need to be taken to run a
 test under some kind of runtime error detection tool.
 
 The interface is intended to be used as follows.
 
@@ skipping 66 matching lines @@
 
     Returns:
       True if this tool can not work with stripped binaries.
     """
     return False
 
 
 class AddressSanitizerTool(BaseTool):
   """AddressSanitizer tool."""
 
-  WRAPPER_PATH = '/system/bin/asanwrapper'
+  TMP_DIR = '/data/local/tmp/asan'
+  WRAPPER_NAME = 'asanwrapper.sh'
 
   def __init__(self, adb):
     self._adb = adb
     self._wrap_properties = ['wrap.com.google.android.apps.ch',
                              'wrap.org.chromium.native_test']
 
   def CopyFiles(self):
     """Copies ASan tools to the device."""
-    files = ['system/lib/libasan_preload.so',
-             'system/bin/asanwrapper',
-             'system/bin/asan/app_process',
-             'system/bin/linker']
-    android_product_out = os.environ['ANDROID_PRODUCT_OUT']
-    self._adb.MakeSystemFolderWritable()
+    files = ['tools/android/asan/asanwrapper.sh',
+             'third_party/llvm-build/Release+Asserts/lib/clang/3.2/lib/linux/' +
+                 'libclang_rt.asan-arm-android.so']
     for f in files:
-      self._adb.PushIfNeeded(os.path.join(android_product_out, f),
-                             os.path.join('/', f))
+      self._adb.PushIfNeeded(os.path.join(CHROME_DIR, f),
+                             os.path.join(AddressSanitizerTool.TMP_DIR,
+                                          os.path.basename(f)))
 
   def GetTestWrapper(self):
-    return AddressSanitizerTool.WRAPPER_PATH
+    return os.path.join(AddressSanitizerTool.TMP_DIR,
+                        AddressSanitizerTool.WRAPPER_NAME)
 
   def GetUtilWrapper(self):
     """Returns the wrapper for utilities, such as forwarder.
 
     AddressSanitizer wrapper must be added to all instrumented binaries,
     including forwarder and the like. This can be removed if such binaries
     were built without instrumentation. """
-    return AddressSanitizerTool.WRAPPER_PATH
+    return self.GetTestWrapper()
 
   def SetupEnvironment(self):
+    self._adb.EnableAdbRoot()
     for prop in self._wrap_properties:
       self._adb.RunShellCommand('setprop %s "logwrapper %s"' % (
           prop, self.GetTestWrapper()))
     SetChromeTimeoutScale(self._adb, self.GetTimeoutScale())
 
   def CleanUpEnvironment(self):
     for prop in self._wrap_properties:
       self._adb.RunShellCommand('setprop %s ""' % (prop,))
     SetChromeTimeoutScale(self._adb, None)
 
@@ skipping 118 matching lines @@
   if not tool_name:
     return BaseTool()
 
   ctor = TOOL_REGISTRY.get(tool_name)
   if ctor:
     return ctor(adb)
   else:
     print 'Unknown tool %s, available tools: %s' % (
         tool_name, ', '.join(sorted(TOOL_REGISTRY.keys())))
     sys.exit(1)