diff options
| author | eugenis@chromium.org <eugenis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 13:03:15 +0000 |
|---|---|---|
| committer | eugenis@chromium.org <eugenis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 13:03:15 +0000 |
| commit | 84031828becaeeb7eee7d5f83c675122d3b3e2cc (patch) | |
| tree | 2226e234e82fe451262e315bb3e8b1d8fd8a3337 | |
| parent | b1d98795e970e62a6760c554391effd3d7300775 (diff) | |
| download | chromium_src-84031828becaeeb7eee7d5f83c675122d3b3e2cc.zip chromium_src-84031828becaeeb7eee7d5f83c675122d3b3e2cc.tar.gz chromium_src-84031828becaeeb7eee7d5f83c675122d3b3e2cc.tar.bz2 | |
Use ASan Android runtime library from third_party/llvm-build.
Delete the temporary copy in tools/android.
BUG=325685
R=bulach@chromium.org
Review URL: https://codereview.chromium.org/254503005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265917 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/android/pylib/valgrind_tools.py | 8 | ||||
| -rwxr-xr-x | tools/android/asan/libclang_rt.asan-arm-android.so | bin | 1330928 -> 0 bytes |
2 files changed, 8 insertions, 0 deletions
diff --git a/build/android/pylib/valgrind_tools.py b/build/android/pylib/valgrind_tools.py index 99c530d..22ac39b 100644 --- a/build/android/pylib/valgrind_tools.py +++ b/build/android/pylib/valgrind_tools.py @@ -22,6 +22,7 @@ Call tool.CleanUpEnvironment(). """ # pylint: disable=R0201 +import glob import os.path import subprocess import sys @@ -103,12 +104,19 @@ class AddressSanitizerTool(BaseTool): # This is required because ASan is a compiler-based tool, and md5sum # includes instrumented code from base. device.old_interface.SetUtilWrapper(self.GetUtilWrapper()) + libs = glob.glob(os.path.join(DIR_SOURCE_ROOT, + 'third_party/llvm-build/Release+Asserts/', + 'lib/clang/*/lib/linux/', + 'libclang_rt.asan-arm-android.so')) + assert len(libs) == 1 + self._lib = libs[0] def CopyFiles(self): """Copies ASan tools to the device.""" subprocess.call([os.path.join(DIR_SOURCE_ROOT, 'tools/android/asan/asan_device_setup.sh'), '--device', self._device.old_interface.GetDevice(), + '--lib', self._lib, '--extra-options', AddressSanitizerTool.EXTRA_OPTIONS]) self._device.old_interface.WaitForDevicePm() diff --git a/tools/android/asan/libclang_rt.asan-arm-android.so b/tools/android/asan/libclang_rt.asan-arm-android.so Binary files differdeleted file mode 100755 index d679070..0000000 --- a/tools/android/asan/libclang_rt.asan-arm-android.so +++ /dev/null |