diff options
| author | Dan Albert <danalbert@google.com> | 2018-01-08 20:04:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-08 20:04:18 +0000 |
| commit | 429feb5faf9f5de2bb035185f4f870d6da761b3f (patch) | |
| tree | 601b4ffb52f2f24c599e5cb38773d92df72153d1 | |
| parent | a3d0382ebdd3d4aac510051fa137ee195197e289 (diff) | |
| parent | 559c980506149fb3741faa64b82fbbbcd6a04e02 (diff) | |
| download | googletest-429feb5faf9f5de2bb035185f4f870d6da761b3f.tar.gz | |
Move the gmock unit tests to libc++. am: fe11825fc5
am: 559c980506
Change-Id: Ibc9a279e5c2ad824978e6bbb35e5ef9c80386c8d
| -rw-r--r-- | googlemock/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/Android.mk b/googlemock/Android.mk index 11f9b607..aca94fe6 100644 --- a/googlemock/Android.mk +++ b/googlemock/Android.mk @@ -38,7 +38,7 @@ define gmock-unit-test $(eval LOCAL_STATIC_LIBRARIES := $(if $(3),$(3)$(4)) libgmock$(4)) \ $(eval LOCAL_STATIC_LIBRARIES += libgtest$(4)) \ $(if $(findstring _ndk,$(4)),$(eval LOCAL_SDK_VERSION := 9)) \ - $(eval LOCAL_NDK_STL_VARIANT := stlport_static) \ + $(eval LOCAL_NDK_STL_VARIANT := c++_static) \ $(if $(findstring _host,$(4)),,\ $(eval LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS))) \ $(eval $(if $(findstring _host,$(4)), \ |