diff options
| author | Dan Albert <danalbert@google.com> | 2018-01-06 17:24:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-06 17:24:03 +0000 |
| commit | 6faf4a719030079812373eb3915e57ea40a6c374 (patch) | |
| tree | a016335972944a4c645cf79d7037b42c9e8df5fb | |
| parent | 559c980506149fb3741faa64b82fbbbcd6a04e02 (diff) | |
| parent | 220810a546aa9db3a3cfd39874663884dbbe8c59 (diff) | |
| download | googletest-6faf4a719030079812373eb3915e57ea40a6c374.tar.gz | |
Remove stlport variants of gtest.
am: 220810a546
Change-Id: I915ceb8f148b873f31ae4153acc833a595ebec54
| -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. |