Commit eee1dd7b authored by Kristian Monsen's avatar Kristian Monsen

Fix warnings warnings in header files, hide others.

Follow upstream where they have any changes in 2.5.0

Change-Id: I3466e9c11242f533a9dff8c1afef4202dd100f2e
parent 335140f2
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
IGNORED_WARNINGS := -Wno-sign-compare -Wno-unused-parameter -Wno-sign-promo
CC_LITE_SRC_FILES := \ CC_LITE_SRC_FILES := \
src/google/protobuf/stubs/common.cc \ src/google/protobuf/stubs/common.cc \
src/google/protobuf/stubs/once.cc \ src/google/protobuf/stubs/once.cc \
...@@ -227,7 +229,7 @@ LOCAL_C_INCLUDES := \ ...@@ -227,7 +229,7 @@ LOCAL_C_INCLUDES := \
# #
#LOCAL_COPY_HEADERS_TO := $(LOCAL_MODULE) #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. # These are the minimum versions and don't need to be update.
ifeq ($(TARGET_ARCH),arm) ifeq ($(TARGET_ARCH),arm)
...@@ -293,7 +295,7 @@ LOCAL_C_INCLUDES := \ ...@@ -293,7 +295,7 @@ LOCAL_C_INCLUDES := \
# #
#LOCAL_COPY_HEADERS_TO := $(LOCAL_MODULE) #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. # These are the minimum versions and don't need to be update.
ifeq ($(TARGET_ARCH),arm) ifeq ($(TARGET_ARCH),arm)
...@@ -319,7 +321,7 @@ LOCAL_C_INCLUDES := \ ...@@ -319,7 +321,7 @@ LOCAL_C_INCLUDES := \
external/zlib \ external/zlib \
$(LOCAL_PATH)/src $(LOCAL_PATH)/src
LOCAL_CFLAGS := -frtti LOCAL_CFLAGS := -frtti $(IGNORED_WARNINGS)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_NDK_STL_VARIANT := gnustl_static LOCAL_NDK_STL_VARIANT := gnustl_static
...@@ -349,6 +351,8 @@ LOCAL_C_INCLUDES := \ ...@@ -349,6 +351,8 @@ LOCAL_C_INCLUDES := \
LOCAL_STATIC_LIBRARIES += libz LOCAL_STATIC_LIBRARIES += libz
LOCAL_LDLIBS := -lpthread LOCAL_LDLIBS := -lpthread
LOCAL_CFLAGS := $(IGNORED_WARNINGS)
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
# To test java proto params build rules. # To test java proto params build rules.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment