diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-09 08:25:46 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-09 08:25:46 +0000 |
| commit | 6ad506815d9177091d357bc28237867605f8d600 (patch) | |
| tree | a016335972944a4c645cf79d7037b42c9e8df5fb | |
| parent | f6de2221a0857d902494bd81901680e0333dc8b9 (diff) | |
| parent | 6820fe7d8048b8cf58b8a3f4ef17a9a152c47081 (diff) | |
| download | googletest-6ad506815d9177091d357bc28237867605f8d600.tar.gz | |
Snap for 4533842 from 6820fe7d8048b8cf58b8a3f4ef17a9a152c47081 to pi-release
Change-Id: I337fad4390af6a3a05d73aba161a500600a2bd73
| -rw-r--r-- | googlemock/Android.mk | 2 | ||||
| -rw-r--r-- | googletest/Android.bp | 17 | ||||
| -rw-r--r-- | googletest/Android.mk | 1 |
3 files changed, 1 insertions, 19 deletions
diff --git a/googlemock/Android.mk b/googlemock/Android.mk index 11f9b607..aca94fe6 100644 --- a/googlemock/Android.mk +++ b/googlemock/Android.mk @@ -38,7 +38,7 @@ define gmock-unit-test $(eval LOCAL_STATIC_LIBRARIES := $(if $(3),$(3)$(4)) libgmock$(4)) \ $(eval LOCAL_STATIC_LIBRARIES += libgtest$(4)) \ $(if $(findstring _ndk,$(4)),$(eval LOCAL_SDK_VERSION := 9)) \ - $(eval LOCAL_NDK_STL_VARIANT := stlport_static) \ + $(eval LOCAL_NDK_STL_VARIANT := c++_static) \ $(if $(findstring _host,$(4)),,\ $(eval LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS))) \ $(eval $(if $(findstring _host,$(4)), \ diff --git a/googletest/Android.bp b/googletest/Android.bp index bc5e9930..550b764c 100644 --- a/googletest/Android.bp +++ b/googletest/Android.bp @@ -34,23 +34,6 @@ cc_defaults { // We need to build one pair of (libgtest, libgtest_main) for each of the three // STLs we support in the NDK since the user's app might use any of them. -// stlport -cc_library_static { - name: "libgtest_ndk_stlport", - defaults: ["libgtest_defaults"], - sdk_version: "9", - stl: "stlport_static", - srcs: ["src/gtest-all.cc"], -} - -cc_library_static { - name: "libgtest_main_ndk_stlport", - defaults: ["libgtest_defaults"], - sdk_version: "9", - stl: "stlport_static", - srcs: ["src/gtest_main.cc"], -} - // libc++ cc_library_static { name: "libgtest_ndk_c++", diff --git a/googletest/Android.mk b/googletest/Android.mk index 38ce7953..95a96e12 100644 --- a/googletest/Android.mk +++ b/googletest/Android.mk @@ -169,7 +169,6 @@ include $(BUILD_STATIC_LIBRARY) else # Tests for the platform built NDK gtest. -$(call gtest-test-suite,_ndk,stlport) $(call gtest-test-suite,_ndk,c++) # Tests for the host gtest. |