From 23f59843dbc16e86d0451123c55243c5f3fdbc33 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Tue, 16 Jan 2018 21:29:24 -0800 Subject: Suppress clang 7.0 unused-private-field warnings. Test: make checkbuild Change-Id: I7a7910ab293ec3b18ae5f1fc154b0cbf6dfdc1dd --- googlemock/Android.mk | 1 + googletest/Android.mk | 1 + 2 files changed, 2 insertions(+) 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)) \ -- cgit v1.2.3