diff options
author | Dan Albert | 2014-11-15 00:47:07 -0600 |
---|---|---|
committer | Gerrit Code Review | 2014-11-15 00:47:08 -0600 |
commit | eef1eb64bb5be68bfb00f8e71d3118a2cfec99e7 (patch) | |
tree | acd39b39d2b13bbe0c7c8fc1c71d53aa93167e24 /tests | |
parent | 38569312bc5a3a4688d45997d81b59abb0a60825 (diff) | |
parent | 01f1ff2440759e34197f741a7b380a71c607f513 (diff) | |
download | platform-bionic-eef1eb64bb5be68bfb00f8e71d3118a2cfec99e7.tar.gz platform-bionic-eef1eb64bb5be68bfb00f8e71d3118a2cfec99e7.tar.xz platform-bionic-eef1eb64bb5be68bfb00f8e71d3118a2cfec99e7.zip |
Merge "Allow asan for glibc tests."
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Android.build.mk | 3 | ||||
-rw-r--r-- | tests/Android.mk | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/Android.build.mk b/tests/Android.build.mk index 9c5df0e5..0754a7bf 100644 --- a/tests/Android.build.mk +++ b/tests/Android.build.mk | |||
@@ -35,7 +35,10 @@ endif | |||
35 | endif | 35 | endif |
36 | 36 | ||
37 | LOCAL_CLANG := $($(module)_clang_$(build_type)) | 37 | LOCAL_CLANG := $($(module)_clang_$(build_type)) |
38 | |||
39 | ifneq ($($(module)_allow_asan),true) | ||
38 | LOCAL_ADDRESS_SANITIZER := false | 40 | LOCAL_ADDRESS_SANITIZER := false |
41 | endif | ||
39 | 42 | ||
40 | LOCAL_FORCE_STATIC_EXECUTABLE := $($(module)_force_static_executable) | 43 | LOCAL_FORCE_STATIC_EXECUTABLE := $($(module)_force_static_executable) |
41 | 44 | ||
diff --git a/tests/Android.mk b/tests/Android.mk index 967ddbda..92d79768 100644 --- a/tests/Android.mk +++ b/tests/Android.mk | |||
@@ -317,6 +317,8 @@ bionic-unit-tests-glibc_cflags := $(test_cflags) | |||
317 | bionic-unit-tests-glibc_cppflags := $(test_cppflags) | 317 | bionic-unit-tests-glibc_cppflags := $(test_cppflags) |
318 | bionic-unit-tests-glibc_ldflags := -Wl,--export-dynamic | 318 | bionic-unit-tests-glibc_ldflags := -Wl,--export-dynamic |
319 | 319 | ||
320 | bionic-unit-tests-glibc_allow_asan := true | ||
321 | |||
320 | module := bionic-unit-tests-glibc | 322 | module := bionic-unit-tests-glibc |
321 | module_tag := optional | 323 | module_tag := optional |
322 | build_type := host | 324 | build_type := host |