Merge "pcre: silence uninteresting warnings."
am: 0e44fd55f8
* commit '0e44fd55f87fd956993683e2574df9c12a6e0413':
pcre: silence uninteresting warnings.
diff --git a/Android.mk b/Android.mk
index 94a5170..931f6d8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,11 +28,16 @@
dist/pcre_scanner.cc \
dist/pcre_stringpiece.cc
+libpcre_cflags := \
+ -DHAVE_CONFIG_H \
+ -Wno-self-assign \
+ -Wno-unused-parameter \
+
# === libpcre targets ===
include $(CLEAR_VARS)
LOCAL_MODULE := libpcre
-LOCAL_CFLAGS += -DHAVE_CONFIG_H
+LOCAL_CFLAGS += $(libpcre_cflags)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/dist
LOCAL_SRC_FILES := $(libpcre_src_files)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
@@ -40,7 +45,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libpcre
-LOCAL_CFLAGS += -DHAVE_CONFIG_H
+LOCAL_CFLAGS += $(libpcre_cflags)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/dist
LOCAL_SRC_FILES := $(libpcre_src_files)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
@@ -48,7 +53,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libpcre
-LOCAL_CFLAGS += -DHAVE_CONFIG_H
+LOCAL_CFLAGS += $(libpcre_cflags)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/dist
LOCAL_SRC_FILES := $(libpcre_src_files)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
@@ -58,7 +63,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libpcrecpp
-LOCAL_CFLAGS += -DHAVE_CONFIG_H
+LOCAL_CFLAGS += $(libpcre_cflags)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/dist
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := $(libpcrecpp_src_files)