diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-09 00:16:39 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-09 00:19:09 -0800 |
| commit | f694f2b912d896c790e5b1a902c1366b5c9e2a9d (patch) | |
| tree | 9c6d8b1e035eea118981f9ba01a0038439bf8e69 | |
| parent | 3655e43058b2732b499a49d87fdd2403299213d8 (diff) | |
| download | gtest-f694f2b912d896c790e5b1a902c1366b5c9e2a9d.tar.gz | |
Remove the host libstdc++ compiled libraries.
Now that we've moved to libc++ as the default, we don't need to sets
of libraries for the host.
Rename the libc++ versions of the libraries to the normal names.
Change-Id: Idba84aedcfeca557f9152129803d9cd50523e722
| -rw-r--r-- | src/Android.mk | 40 | ||||
| -rw-r--r-- | test/Android.mk | 2 |
2 files changed, 3 insertions, 39 deletions
diff --git a/src/Android.mk b/src/Android.mk index 3547035..19799a6 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -40,38 +40,6 @@ libgtest_cflags := \ -Wno-missing-field-initializers \ ####################################################################### -# gtest lib host - -include $(CLEAR_VARS) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := gtest-all.cc -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) - -####################################################################### -# gtest_main lib host - -include $(CLEAR_VARS) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := gtest_main.cc -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) - -####################################################################### # gtest lib target include $(CLEAR_VARS) @@ -121,10 +89,9 @@ LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := gtest-all.cc LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) -LOCAL_MODULE := libgtest_libc++_host +LOCAL_MODULE := libgtest_host LOCAL_MULTILIB := both LOCAL_ADDRESS_SANITIZER := false -LOCAL_CXX_STL := libc++ include $(BUILD_HOST_STATIC_LIBRARY) @@ -139,10 +106,9 @@ LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := gtest_main.cc LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) -LOCAL_MODULE := libgtest_main_libc++_host +LOCAL_MODULE := libgtest_main_host LOCAL_MULTILIB := both LOCAL_ADDRESS_SANITIZER := false -LOCAL_CXX_STL := libc++ include $(BUILD_HOST_STATIC_LIBRARY) @@ -159,7 +125,6 @@ LOCAL_C_INCLUDES := $(libgtest_target_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_libc++ LOCAL_ADDRESS_SANITIZER := false -LOCAL_CXX_STL := libc++ include $(BUILD_STATIC_LIBRARY) @@ -176,7 +141,6 @@ LOCAL_C_INCLUDES := $(libgtest_target_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_main_libc++ LOCAL_ADDRESS_SANITIZER := false -LOCAL_CXX_STL := libc++ include $(BUILD_STATIC_LIBRARY) endif diff --git a/test/Android.mk b/test/Android.mk index d1cb789..b89082a 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 := libstdc++ +libgtest_test_host_cxx_stl := libc++ # $(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 |