diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-23 17:43:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-23 17:43:26 +0000 |
| commit | 30fb1ef756886a062792310048ea276b807531d6 (patch) | |
| tree | 3a9b0cf936caf8c091af69c9b87eb656f14cebae | |
| parent | be0656e745b4c8e5bfd7efaa44d5dc4367375d72 (diff) | |
| parent | fde6da7c999728eb1b9b510966040bc1e1190335 (diff) | |
| download | gtest-30fb1ef756886a062792310048ea276b807531d6.tar.gz | |
Merge "Never build gtest libs with ASAN."gradle_0.14.1gradle_0.14.0
| -rw-r--r-- | src/Android.mk | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/Android.mk b/src/Android.mk index 65fa2b8..c86ef30 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -43,6 +43,7 @@ libgtest_cflags := \ # gtest lib host include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := gtest-all.cc @@ -57,6 +58,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) # gtest_main lib host include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := gtest_main.cc @@ -71,6 +73,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) # gtest lib target include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SDK_VERSION := 9 LOCAL_NDK_STL_VARIANT := stlport_static @@ -87,6 +90,7 @@ include $(BUILD_STATIC_LIBRARY) # gtest_main lib target include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SDK_VERSION := 9 LOCAL_NDK_STL_VARIANT := stlport_static @@ -108,6 +112,7 @@ ifeq (,$(TARGET_BUILD_APPS)) # gtest lib host include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CLANG := true LOCAL_CPP_EXTENSION := .cc @@ -116,6 +121,7 @@ LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_libc++_host LOCAL_MULTILIB := both +LOCAL_ADDRESS_SANITIZER := false include external/libcxx/libcxx.mk include $(BUILD_HOST_STATIC_LIBRARY) @@ -124,6 +130,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) # gtest_main lib host include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CLANG := true LOCAL_CPP_EXTENSION := .cc @@ -132,6 +139,7 @@ LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_main_libc++_host LOCAL_MULTILIB := both +LOCAL_ADDRESS_SANITIZER := false include external/libcxx/libcxx.mk include $(BUILD_HOST_STATIC_LIBRARY) @@ -140,6 +148,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) # gtest lib target include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CLANG := true LOCAL_CPP_EXTENSION := .cc @@ -147,6 +156,7 @@ LOCAL_SRC_FILES := gtest-all.cc LOCAL_C_INCLUDES := $(libgtest_target_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_libc++ +LOCAL_ADDRESS_SANITIZER := false include external/libcxx/libcxx.mk include $(BUILD_STATIC_LIBRARY) @@ -155,6 +165,7 @@ include $(BUILD_STATIC_LIBRARY) # gtest_main lib target include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CLANG := true LOCAL_CPP_EXTENSION := .cc @@ -162,6 +173,7 @@ LOCAL_SRC_FILES := gtest_main.cc LOCAL_C_INCLUDES := $(libgtest_target_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_main_libc++ +LOCAL_ADDRESS_SANITIZER := false include external/libcxx/libcxx.mk include $(BUILD_STATIC_LIBRARY) |