diff options
| author | Elliott Hughes <enh@google.com> | 2016-01-22 00:57:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-22 00:57:26 +0000 |
| commit | 222bbf4b3fb8e13c21686803e47e31aa3e4ad130 (patch) | |
| tree | 7d845fe3c7a3d59021fbddddd927105c73b4c2c5 | |
| parent | 942ae22f1a10d0d404d0c59ba54d2ea01256c23b (diff) | |
| parent | 0e44fd55f87fd956993683e2574df9c12a6e0413 (diff) | |
| download | android_external_pcre-staging/cm-14.0.tar.gz android_external_pcre-staging/cm-14.0.tar.bz2 android_external_pcre-staging/cm-14.0.zip | |
Merge "pcre: silence uninteresting warnings."staging/cm-14.0
am: 0e44fd55f8
* commit '0e44fd55f87fd956993683e2574df9c12a6e0413':
pcre: silence uninteresting warnings.
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -28,11 +28,16 @@ libpcrecpp_src_files := \ 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 $(BUILD_HOST_STATIC_LIBRARY) 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 $(BUILD_STATIC_LIBRARY) 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 $(BUILD_SHARED_LIBRARY) 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) |