Remove stlport variants of gtest.ndk-r17bndk-r17-beta2ndk-r17-beta1ndk-r17android-wear-8.0.0_r1ndk-release-r17

Test: make checkbuild
Bug: None
Change-Id: I8c40e34297c0b00d5deb75b721c0ce6e6916150c

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.