diff options
| author | Dan Albert <danalbert@google.com> | 2018-01-04 00:16:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-04 00:16:54 +0000 |
| commit | 669632da52b924b19d9cc5a1484ae53c66301ca5 (patch) | |
| tree | eb1786f05f70d8d58c4c605f15e249690e529731 | |
| parent | 1b4c11bc6dc615a07c8e6df6ef6d095c81b6f714 (diff) | |
| parent | a3d0382ebdd3d4aac510051fa137ee195197e289 (diff) | |
| download | googletest-669632da52b924b19d9cc5a1484ae53c66301ca5.tar.gz | |
Remove gnustl gtest variant. am: ed9711f60f am: f0145fade2
am: a3d0382ebd
Change-Id: I5283b44857013b4cf3e9e126e2c96723ca37de8c
| -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 54319717..bc5e9930 100644 --- a/googletest/Android.bp +++ b/googletest/Android.bp @@ -68,23 +68,6 @@ cc_library_static { srcs: ["src/gtest_main.cc"], } -// gnustl -cc_library_static { - name: "libgtest_ndk_gnustl", - defaults: ["libgtest_defaults"], - sdk_version: "9", - stl: "gnustl_static", - srcs: ["src/gtest-all.cc"], -} - -cc_library_static { - name: "libgtest_main_ndk_gnustl", - defaults: ["libgtest_defaults"], - sdk_version: "9", - stl: "gnustl_static", - srcs: ["src/gtest_main.cc"], -} - // Platform and host libraries. cc_library_static { name: "libgtest", diff --git a/googletest/Android.mk b/googletest/Android.mk index 7d14c258..38ce7953 100644 --- a/googletest/Android.mk +++ b/googletest/Android.mk @@ -170,7 +170,6 @@ else # Tests for the platform built NDK gtest. $(call gtest-test-suite,_ndk,stlport) -$(call gtest-test-suite,_ndk,gnustl) $(call gtest-test-suite,_ndk,c++) # Tests for the host gtest. |