diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2018-01-16 21:29:24 -0800 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2018-02-14 11:39:43 -0800 |
| commit | 23f59843dbc16e86d0451123c55243c5f3fdbc33 (patch) | |
| tree | 2dccd898ea8123e96e6d43de5519c1901a28a01f | |
| parent | 220810a546aa9db3a3cfd39874663884dbbe8c59 (diff) | |
| download | googletest-ndk-release-r18.tar.gz | |
Suppress clang 7.0 unused-private-field warnings.ndk-r18bndk-r18-beta2ndk-r18-beta1android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7o-mr1-iot-preview-8o-mr1-iot-preview-7ndk-release-r18
Test: make checkbuild
Change-Id: I7a7910ab293ec3b18ae5f1fc154b0cbf6dfdc1dd
| -rw-r--r-- | googlemock/Android.mk | 1 | ||||
| -rw-r--r-- | googletest/Android.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/googlemock/Android.mk b/googlemock/Android.mk index aca94fe6..147d1035 100644 --- a/googlemock/Android.mk +++ b/googlemock/Android.mk @@ -34,6 +34,7 @@ define gmock-unit-test $(eval LOCAL_C_INCLUDES := $(LOCAL_PATH)/include) \ $(eval LOCAL_C_INCLUDES += $(LOCAL_PATH)/../googletest) \ $(eval LOCAL_CFLAGS += -Wall -Werror -Wno-sign-compare -Wno-unused-parameter) \ + $(eval LOCAL_CFLAGS += -Wno-unused-private-field) \ $(eval LOCAL_CPP_FEATURES := rtti) \ $(eval LOCAL_STATIC_LIBRARIES := $(if $(3),$(3)$(4)) libgmock$(4)) \ $(eval LOCAL_STATIC_LIBRARIES += libgtest$(4)) \ diff --git a/googletest/Android.mk b/googletest/Android.mk index 95a96e12..d7117db8 100644 --- a/googletest/Android.mk +++ b/googletest/Android.mk @@ -41,6 +41,7 @@ define gtest-unit-test $(eval LOCAL_C_INCLUDES := $(LOCAL_PATH)/include) \ $(eval LOCAL_CPP_FEATURES := rtti) \ $(eval LOCAL_CFLAGS := -Wall -Werror -Wno-sign-compare -Wno-unnamed-type-template-args) \ + $(eval LOCAL_CFLAGS += -Wno-unused-private-field) \ $(eval LOCAL_STATIC_LIBRARIES := \ $(if $(3),$(3)$(4)$(if $(5),_$(5))) libgtest$(4)$(if $(5),_$(5))) \ $(if $(findstring _ndk,$(4)),$(eval LOCAL_LDLIBS := -ldl)) \ |