diff options
| author | Dan Albert <danalbert@google.com> | 2018-01-08 20:16:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-08 20:16:26 +0000 |
| commit | 6820fe7d8048b8cf58b8a3f4ef17a9a152c47081 (patch) | |
| tree | a016335972944a4c645cf79d7037b42c9e8df5fb | |
| parent | 1f457aa03152112f8723c36b85da46941fce577f (diff) | |
| parent | d3fbe42643d6252e8dfa9f5073dcc856ad42a3b2 (diff) | |
| download | googletest-6820fe7d8048b8cf58b8a3f4ef17a9a152c47081.tar.gz | |
Remove stlport variants of gtest. am: 220810a546 am: 6faf4a7190
am: d3fbe42643
Change-Id: I678d3f6f27c3ab9230ad3060dfde5c3938eb4cf8
| -rw-r--r-- | googletest/Android.bp | 17 | ||||
| -rw-r--r-- | googletest/Android.mk | 1 |
2 files changed, 0 insertions, 18 deletions
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. |