Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed Input am: 4bf8f12b1d am: f6df708e86 am: 7290eb3bc1 am: f95e7ccb58 am: 7c63cbf090 am: 1e378e34a8 am: 20d8f2465f am: 4a724526f9 am: 337d1dbad9 am: 46eb5ae412
am: 6d46119d1a
* commit '6d46119d1a77eff3297a9121f3511901fc82a01d':
Fix CVE-2016-0718: Expat XML Parser Crashes on Malformed Input
Change-Id: If80a65da7c01e70dd8d58074fa908cf3e23ae649
diff --git a/Android.mk b/Android.mk
index 8e3eaf0..cb4025a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,48 +18,37 @@
common_C_INCLUDES += \
$(LOCAL_PATH)/lib
-common_COPY_HEADERS_TO := libexpat
-common_COPY_HEADERS := \
- lib/expat.h \
- lib/expat_external.h
-
# For the host
# =====================================================
+# Host static library
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(common_SRC_FILES)
LOCAL_CFLAGS += $(common_CFLAGS)
LOCAL_C_INCLUDES += $(common_C_INCLUDES)
-ifeq ($(HOST_OS),darwin)
- LOCAL_CFLAGS += -fno-common
-endif
+LOCAL_CFLAGS_darwin += -fno-common
LOCAL_MODULE:= libexpat
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/lib
LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY)
-
+# Host shared library
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(common_SRC_FILES)
LOCAL_CFLAGS += $(common_CFLAGS)
LOCAL_C_INCLUDES += $(common_C_INCLUDES)
-ifeq ($(HOST_OS),darwin)
- LOCAL_CFLAGS += -fno-common
-endif
+LOCAL_CFLAGS_darwin += -fno-common
LOCAL_MODULE:= libexpat-host
-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)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/lib
LOCAL_MULTILIB := both
include $(BUILD_HOST_SHARED_LIBRARY)
@@ -84,6 +73,7 @@
LOCAL_MODULE:= libexpat_static
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE_TAGS := optional
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/lib
include $(BUILD_STATIC_LIBRARY)
@@ -104,7 +94,6 @@
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)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/lib
include $(BUILD_SHARED_LIBRARY)
diff --git a/README.version b/README.version
new file mode 100644
index 0000000..5514625
--- /dev/null
+++ b/README.version
@@ -0,0 +1,3 @@
+URL: http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
+Version: 2.1.0
+BugComponent: 24949
