diff options
| author | Dan Albert <danalbert@google.com> | 2018-01-06 17:24:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-06 17:24:00 +0000 |
| commit | 559c980506149fb3741faa64b82fbbbcd6a04e02 (patch) | |
| tree | 601b4ffb52f2f24c599e5cb38773d92df72153d1 | |
| parent | f0145fade2723507773819415c12450835177eb7 (diff) | |
| parent | fe11825fc5ffcf11bc1a0f0cdf3af24e006284ad (diff) | |
| download | googletest-559c980506149fb3741faa64b82fbbbcd6a04e02.tar.gz | |
Move the gmock unit tests to libc++.
am: fe11825fc5
Change-Id: I73ba01c928a8b6ea5f0f6b5ce114aa6bb37884fb
| -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)), \ |