diff options
| author | Ivaylo Asenov <ivaylo.asenov@linaro.org> | 2017-06-19 14:46:32 +0100 |
|---|---|---|
| committer | Ivaylo Asenov <Ivaylo.Asenov@linaro.org> | 2017-06-19 14:48:48 +0100 |
| commit | 73303d6c08549f8bf7db023fd8ad193e76fbef1a (patch) | |
| tree | 1ad369adabb455b83ba5e812ab873aeb5fe00275 | |
| parent | 4f09a9feaa75ecaef95fb2ad6f7c625c33ab8a4f (diff) | |
| download | libxml2-linaro-upstream-2.9.4.tar.gz | |
Changes for successful compilationlinaro-upstream-2.9.4
Change-Id: Ic6d68f42e48eb25064c6b3c5c439ebc1bff3d07b
Signed-off-by: Ivaylo Asenov <ivaylo.asenov@linaro.org>
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | include/libxml/encoding.h | 2 | ||||
| -rw-r--r-- | include/libxml/xmlversion.h | 18 | ||||
| -rw-r--r-- | os400/iconv/iconv.h | 1 |
4 files changed, 16 insertions, 7 deletions
@@ -75,6 +75,8 @@ cc_library { "xmlsave.c", "xmlmodule.c", "schematron.c", + "HTMLparser.c", + "HTMLtree.c" ], export_include_dirs: ["include"], cflags: [ diff --git a/include/libxml/encoding.h b/include/libxml/encoding.h index 7967cc66..a1a028ac 100644 --- a/include/libxml/encoding.h +++ b/include/libxml/encoding.h @@ -25,7 +25,7 @@ #include <libxml/xmlversion.h> #ifdef LIBXML_ICONV_ENABLED -#include <iconv.h> +#include "../../os400/iconv/iconv.h" #endif #ifdef LIBXML_ICU_ENABLED #include <unicode/ucnv.h> diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlversion.h index 59ba74f2..c47d6167 100644 --- a/include/libxml/xmlversion.h +++ b/include/libxml/xmlversion.h @@ -174,7 +174,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether the FTP support is configured in */ -#if 1 +#if 0 #define LIBXML_FTP_ENABLED #endif @@ -183,7 +183,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether the HTTP support is configured in */ -#if 1 +#if 0 #define LIBXML_HTTP_ENABLED #endif @@ -201,7 +201,13 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether the HTML support is configured in */ -#if 1 +// BEGIN android-changed +// Was: #if 1 +// HTML support has security vulnerabilities (b/27338391) +// and is not needed in Android. +//#if 0 +// END android-changed +#if 0 #define LIBXML_HTML_ENABLED #endif @@ -210,7 +216,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether the deprecated APIs are compiled in for compatibility */ -#if 1 +#if 0 #define LIBXML_LEGACY_ENABLED #endif @@ -273,7 +279,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether iconv support is available */ -#if 1 +#if 0 #define LIBXML_ICONV_ENABLED #endif @@ -405,7 +411,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether the Lzma support is compiled in */ -#if 1 +#if 0 #define LIBXML_LZMA_ENABLED #endif diff --git a/os400/iconv/iconv.h b/os400/iconv/iconv.h index 87a8bbc5..f4ab61f5 100644 --- a/os400/iconv/iconv.h +++ b/os400/iconv/iconv.h @@ -32,6 +32,7 @@ int IconvClose(Iconv_t cd); #define iconv_close IconvClose #endif +#define ICONV_CONST const #ifdef __cplusplus } |