Run locally-built Android utils under ASan (if built with 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 75 matching lines @@
   """AddressSanitizer tool."""
 
   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',
                              'wrap.org.chromium.content_shell',
-                             'wrap.org.chromium.chrome.testsh']
+                             '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'))
@@ skipping 147 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)