diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-05 02:33:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-05 02:33:49 +0000 |
| commit | 3655e43058b2732b499a49d87fdd2403299213d8 (patch) | |
| tree | c4a24a5e9841fda534c1cbb9e9e63c0799c468df | |
| parent | 30fb1ef756886a062792310048ea276b807531d6 (diff) | |
| parent | 3803e25acd8739374d4288f44f8d1b18892cd364 (diff) | |
| download | gtest-3655e43058b2732b499a49d87fdd2403299213d8.tar.gz | |
Merge "Be explicit about the STL for host modules."gradle_0.14.2
| -rw-r--r-- | src/Android.mk | 10 | ||||
| -rw-r--r-- | test/Android.mk | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/Android.mk b/src/Android.mk index c86ef30..3547035 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -51,6 +51,7 @@ LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_host LOCAL_MULTILIB := both +LOCAL_CXX_STL := libstdc++ include $(BUILD_HOST_STATIC_LIBRARY) @@ -66,6 +67,7 @@ LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_main_host LOCAL_MULTILIB := both +LOCAL_CXX_STL := libstdc++ include $(BUILD_HOST_STATIC_LIBRARY) @@ -122,8 +124,8 @@ LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_libc++_host LOCAL_MULTILIB := both LOCAL_ADDRESS_SANITIZER := false +LOCAL_CXX_STL := libc++ -include external/libcxx/libcxx.mk include $(BUILD_HOST_STATIC_LIBRARY) ####################################################################### @@ -140,8 +142,8 @@ LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_main_libc++_host LOCAL_MULTILIB := both LOCAL_ADDRESS_SANITIZER := false +LOCAL_CXX_STL := libc++ -include external/libcxx/libcxx.mk include $(BUILD_HOST_STATIC_LIBRARY) ####################################################################### @@ -157,8 +159,8 @@ LOCAL_C_INCLUDES := $(libgtest_target_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_libc++ LOCAL_ADDRESS_SANITIZER := false +LOCAL_CXX_STL := libc++ -include external/libcxx/libcxx.mk include $(BUILD_STATIC_LIBRARY) ####################################################################### @@ -174,7 +176,7 @@ LOCAL_C_INCLUDES := $(libgtest_target_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_main_libc++ LOCAL_ADDRESS_SANITIZER := false +LOCAL_CXX_STL := libc++ -include external/libcxx/libcxx.mk include $(BUILD_STATIC_LIBRARY) endif diff --git a/test/Android.mk b/test/Android.mk index 6e4d4b9..d1cb789 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -35,7 +35,7 @@ libgtest_test_cxx_stl := stlport libgtest_test_host_includes := $(libgtest_test_common_includes) libgtest_test_host_static_lib := libgtest_main_host libgtest_host libgtest_test_host_ldflags := -lpthread -libgtest_test_host_cxx_stl := default +libgtest_test_host_cxx_stl := libstdc++ # $(2) and $(4) must be set or cleared in sync. $(2) is used to # generate the right make target (host vs device). $(4) is used in the @@ -51,6 +51,7 @@ libgtest_test_host_cxx_stl := default define _define-test $(foreach file,$(1), \ $(eval include $(CLEAR_VARS)) \ + $(eval LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk) \ $(eval LOCAL_CPP_EXTENSION := .cc) \ $(eval LOCAL_SRC_FILES := $(file)) \ $(eval LOCAL_C_INCLUDES := $(libgtest_test$(4)_includes)) \ |