From cd0ff6eb0b178cc1c3ed4300cd4066ea3a5c180b Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 13 Nov 2013 11:07:49 -0800 Subject: Fix warnings warnings in header files, hide others. Follow upstream where they have any changes in 2.5.0 Change-Id: I3466e9c11242f533a9dff8c1afef4202dd100f2e --- Android.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 56419db..c977d3c 100644 --- a/Android.mk +++ b/Android.mk @@ -16,6 +16,8 @@ LOCAL_PATH := $(call my-dir) +IGNORED_WARNINGS := -Wno-sign-compare -Wno-unused-parameter -Wno-sign-promo + CC_LITE_SRC_FILES := \ src/google/protobuf/stubs/common.cc \ src/google/protobuf/stubs/once.cc \ @@ -227,7 +229,7 @@ LOCAL_C_INCLUDES := \ # #LOCAL_COPY_HEADERS_TO := $(LOCAL_MODULE) -LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI +LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI $(IGNORED_WARNINGS) # These are the minimum versions and don't need to be update. ifeq ($(TARGET_ARCH),arm) @@ -293,7 +295,7 @@ LOCAL_C_INCLUDES := \ # #LOCAL_COPY_HEADERS_TO := $(LOCAL_MODULE) -LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI +LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI $(IGNORED_WARNINGS) # These are the minimum versions and don't need to be update. ifeq ($(TARGET_ARCH),arm) @@ -319,7 +321,7 @@ LOCAL_C_INCLUDES := \ external/zlib \ $(LOCAL_PATH)/src -LOCAL_CFLAGS := -frtti +LOCAL_CFLAGS := -frtti $(IGNORED_WARNINGS) LOCAL_SDK_VERSION := 14 LOCAL_NDK_STL_VARIANT := gnustl_static @@ -349,6 +351,8 @@ LOCAL_C_INCLUDES := \ LOCAL_STATIC_LIBRARIES += libz LOCAL_LDLIBS := -lpthread +LOCAL_CFLAGS := $(IGNORED_WARNINGS) + include $(BUILD_HOST_EXECUTABLE) # To test java proto params build rules. -- cgit v1.1