diff options
| author | Dan Albert <danalbert@google.com> | 2018-01-04 00:16:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-04 00:16:51 +0000 |
| commit | 1b4c11bc6dc615a07c8e6df6ef6d095c81b6f714 (patch) | |
| tree | aeb7a56fbbafc2a3bd14a9705d9682f69e969cd8 | |
| parent | 46572dbb50b68278f2e4a0023fb40f7ac5533ff7 (diff) | |
| parent | ecc2615ba6ffb044ebbc9b4fd1c465006c5be93c (diff) | |
| download | googletest-1b4c11bc6dc615a07c8e6df6ef6d095c81b6f714.tar.gz | |
Move NDK gmock to libc++. am: 4b548699c6 am: 28c8815acd
am: ecc2615ba6
Change-Id: Ic814a90d42c74e708fe98934928280788a1d516f
| -rw-r--r-- | googlemock/Android.bp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/Android.bp b/googlemock/Android.bp index 898acff1..88b3baac 100644 --- a/googlemock/Android.bp +++ b/googlemock/Android.bp @@ -30,7 +30,7 @@ cc_defaults { cc_defaults { name: "gmock_ndk", sdk_version: "9", - stl: "gnustl_static", + stl: "c++_static", cppflags: ["-std=c++11"], } @@ -54,14 +54,14 @@ cc_library_static { name: "libgmock_ndk", defaults: ["gmock_ndk", "gmock_flags"], srcs: ["src/gmock-all.cc"], - static_libs: ["libgtest_ndk_gnustl"], + static_libs: ["libgtest_ndk_c++"], } cc_library_static { name: "libgmock_main_ndk", defaults: ["gmock_ndk", "gmock_flags"], srcs: ["src/gmock_main.cc"], - static_libs: ["libgtest_ndk_gnustl"], + static_libs: ["libgtest_ndk_c++"], } cc_library_static { |