diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-09 16:11:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-09 16:11:39 -0700 |
| commit | bb9f3f74212ef523ff693cba9d782575ebba7418 (patch) | |
| tree | 6bb9ce6a8a6811d1fea46fc88cc840b65c89a4b7 /Android.mk | |
| parent | 4b529ee161c0cb544c45bf54cb8c731c4403aab8 (diff) | |
| parent | 7174719ff5f71e7fa1bc3af063905c92869c3b0e (diff) | |
| download | expat-jb-mr1.1-dev.tar.gz | |
am 7174719f: Merge "Upgrade to expat 2.1.0."android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-dev
* commit '7174719ff5f71e7fa1bc3af063905c92869c3b0e':
Upgrade to expat 2.1.0.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -8,7 +8,12 @@ common_SRC_FILES := \ lib/xmlrole.c \ lib/xmltok.c -common_CFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions -DHAVE_EXPAT_CONFIG_H +common_CFLAGS := \ + -Wall \ + -Wmissing-prototypes -Wstrict-prototypes \ + -Wno-unused-parameter -Wno-missing-field-initializers \ + -fexceptions \ + -DHAVE_EXPAT_CONFIG_H common_C_INCLUDES += \ $(LOCAL_PATH)/lib @@ -32,6 +37,7 @@ ifeq ($(HOST_OS),darwin) endif LOCAL_MODULE:= libexpat +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_TAGS := optional include $(BUILD_HOST_STATIC_LIBRARY) @@ -48,6 +54,7 @@ ifeq ($(HOST_OS),darwin) endif LOCAL_MODULE:= libexpat +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_TAGS := optional LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(common_COPY_HEADERS) @@ -70,6 +77,7 @@ LOCAL_CFLAGS += $(common_CFLAGS) LOCAL_C_INCLUDES += $(common_C_INCLUDES) LOCAL_MODULE:= libexpat_static +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_TAGS := optional include $(BUILD_STATIC_LIBRARY) @@ -86,6 +94,7 @@ LOCAL_CFLAGS += $(common_CFLAGS) LOCAL_C_INCLUDES += $(common_C_INCLUDES) LOCAL_MODULE:= libexpat +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_TAGS := optional LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(common_COPY_HEADERS) |