diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2018-02-15 04:19:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-15 04:19:58 +0000 |
| commit | 921be817eec95af0f321362c02554bd02b502ac7 (patch) | |
| tree | 2dccd898ea8123e96e6d43de5519c1901a28a01f | |
| parent | 6820fe7d8048b8cf58b8a3f4ef17a9a152c47081 (diff) | |
| parent | 2f6c6beadbda19c6e3f1480247da1bf86f7e4646 (diff) | |
| download | googletest-pie-qpr1-release.tar.gz | |
Suppress clang 7.0 unused-private-field warnings. am: 23f59843db am: 487902d366android-o-mr1-iot-release-1.0.3android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
am: 2f6c6beadb
Change-Id: I1dcbeae0c78371dda2de2bdbe283d8abf3a5cce1
| -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)) \ |