Remove stlport variants of gtest. am: 220810a546
am: 6faf4a7190
Change-Id: I8624d331a5fe27cfa70cec3458002aed7b29f4c3
diff --git a/googletest/Android.bp b/googletest/Android.bp
index bc5e993..550b764 100644
--- a/googletest/Android.bp
+++ b/googletest/Android.bp
@@ -34,23 +34,6 @@
// 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 38ce795..95a96e12 100644
--- a/googletest/Android.mk
+++ b/googletest/Android.mk
@@ -169,7 +169,6 @@
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.
