commit 222bbf4b3fb8e13c21686803e47e31aa3e4ad130
author Elliott Hughes <enh@google.com> Fri Jan 22 00:57:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 22 00:57:26 2016 +0000
tree 7d845fe3c7a3d59021fbddddd927105c73b4c2c5
parent 942ae22f1a10d0d404d0c59ba54d2ea01256c23b
parent 0e44fd55f87fd956993683e2574df9c12a6e0413

Merge "pcre: silence uninteresting warnings."
am: 0e44fd55f8

* commit '0e44fd55f87fd956993683e2574df9c12a6e0413':
  pcre: silence uninteresting warnings.

Android.mk

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)