Switch to the "new" way of ASan deployment on Android devices.

build/android/pylib/valgrind_tools.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.

[frankf, 2014/01/18 01:55:57]

You should also move this into pylib/utils in a future CL

 # 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.
 
 1. For tests that simply run a native process (i.e. no activity is spawned):
 
 Call tool.CopyFiles().
 Prepend test command line with tool.GetTestWrapper().
 
 2. For tests that spawn an activity:
 
 Call tool.CopyFiles().
 Call tool.SetupEnvironment().
 Run the test as usual.
 Call tool.CleanUpEnvironment().
 """
 
 import os.path
+import subprocess
 import sys
 from glob import glob
 
 from constants import DIR_SOURCE_ROOT
 
 
 def SetChromeTimeoutScale(adb, scale):
   """Sets the timeout scale in /data/local/tmp/chrome_timeout_scale to scale."""
   path = '/data/local/tmp/chrome_timeout_scale'
   if not scale or scale == 1.0:
@@ skipping 43 matching lines @@
 
     Returns:
       True if this tool can not work with stripped binaries.
     """
     return False
 
 
 class AddressSanitizerTool(BaseTool):
   """AddressSanitizer tool."""
 
-  TMP_DIR = '/data/local/tmp/asan'
-  WRAPPER_NAME = 'asanwrapper.sh'
+  WRAPPER_NAME = '/system/bin/asanwrapper'
 
   def __init__(self, adb):
     self._adb = adb
-    self._wrap_properties = ['wrap.com.google.android.apps.ch',
-                             'wrap.org.chromium.native_test',
-                             'wrap.org.chromium.content_shell',
-                             'wrap.org.chromium.chrome.testsh',
-                             'wrap.org.chromium.android_webvi']
     # Configure AndroidCommands to run utils (such as md5sum_bin) under ASan.
     # This is required because ASan is a compiler-based tool, and md5sum
     # includes instrumented code from base.
     adb.SetUtilWrapper(self.GetUtilWrapper())
 
   def CopyFiles(self):
     """Copies ASan tools to the device."""
-    files = (['tools/android/asan/asanwrapper.sh'] +
-              glob('third_party/llvm-build/Release+Asserts/lib/clang/*/lib/'
-                   'linux/libclang_rt.asan-arm-android.so'))
-    for f in files:
-      self._adb.PushIfNeeded(os.path.join(DIR_SOURCE_ROOT, f),
-                             os.path.join(AddressSanitizerTool.TMP_DIR,
-                                          os.path.basename(f)))
+    subprocess.call([os.path.join(DIR_SOURCE_ROOT,
+                                  'tools/android/asan/asan_device_setup.sh'),
+                     self._adb.GetDevice()])
+    # Reboot is required after asan_device_setup.sh.

[bulach, 2014/01/17 13:27:53]

is it always required? can we detect if the property that requires reboot has
actually changed and then reboot after that?
also... does it need a full reboot or would adb shell stop && adb shell start be
enough?

[eugenis, 2014/01/20 13:51:18]

Yes, definitely.
I think start & stop would be enough. All we need is to restart Zygote process.
It can be done as part of asan_device_setup.sh, too, if we can reliably detect
when it is needed.

+    # Unfortunately, this way we reboot the device twice before running the
+    # tests.
+    self._adb.Reboot()
 
   def GetTestWrapper(self):
-    return os.path.join(AddressSanitizerTool.TMP_DIR,
-                        AddressSanitizerTool.WRAPPER_NAME)
+    return 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 self.GetTestWrapper()
 
   def SetupEnvironment(self):
     self._adb.EnableAdbRoot()
-    self._adb.RunShellCommand('setenforce 0')
-    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)
 
   def GetTimeoutScale(self):
     # Very slow startup.
     return 20.0
 
 
 class ValgrindTool(BaseTool):
   """Base abstract class for Valgrind tools."""
 
@@ skipping 111 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)