diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2018-02-15 04:07:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-15 04:07:56 +0000 |
| commit | 487902d366853f62a847bb9a847a467504db9985 (patch) | |
| tree | 2dccd898ea8123e96e6d43de5519c1901a28a01f | |
| parent | 6faf4a719030079812373eb3915e57ea40a6c374 (diff) | |
| parent | 23f59843dbc16e86d0451123c55243c5f3fdbc33 (diff) | |
| download | googletest-487902d366853f62a847bb9a847a467504db9985.tar.gz | |
Suppress clang 7.0 unused-private-field warnings.
am: 23f59843db
Change-Id: I229b95cc30fe93b29e30bb9b1fe137e673113405
| -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)) \ |