commit a037984aea3317260edd1127abb39e30e845bc94
author android-build-team Robot <android-build-team-robot@google.com> Thu Feb 15 08:24:44 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Feb 15 08:24:44 2018 +0000
tree 2dccd898ea8123e96e6d43de5519c1901a28a01f
parent 6ad506815d9177091d357bc28237867605f8d600
parent 921be817eec95af0f321362c02554bd02b502ac7

Snap for 4605948 from 921be817eec95af0f321362c02554bd02b502ac7 to pi-release

Change-Id: I4066ed5758954f9e5adaf402007fd7661e5d29f8

googlemock/Android.mk

diff --git a/googlemock/Android.mk b/googlemock/Android.mk
index aca94fe..147d103 100644
--- a/googlemock/Android.mk
+++ b/googlemock/Android.mk
@@ -34,6 +34,7 @@
     $(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)) \

googletest/Android.mk

diff --git a/googletest/Android.mk b/googletest/Android.mk
index 95a96e12..d7117db 100644
--- a/googletest/Android.mk
+++ b/googletest/Android.mk
@@ -41,6 +41,7 @@
     $(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)) \