diff options
| author | Elliott Hughes <enh@google.com> | 2014-10-30 22:54:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-30 22:54:10 +0000 |
| commit | 043d23940bbf2cce10d302d5cb54a9e1e82a71f8 (patch) | |
| tree | 4d8d220bd476d620582363a2963ba4aad981c1a5 | |
| parent | bd7379f5dc691a177b8e3bf3b765e8388bf06b4c (diff) | |
| parent | 7ce9181e2ee738e683d0ad09aae48c7313ae1142 (diff) | |
| download | android_external_libxml2-043d23940bbf2cce10d302d5cb54a9e1e82a71f8.tar.gz android_external_libxml2-043d23940bbf2cce10d302d5cb54a9e1e82a71f8.tar.bz2 android_external_libxml2-043d23940bbf2cce10d302d5cb54a9e1e82a71f8.zip | |
Merge "Disable ftp, http, and zlib in the source."
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | include/libxml/xmlversion.h | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -34,7 +34,7 @@ LOCAL_PATH := $(call my-dir) # # This comes from the automake-generated Makefile. -# We deliberately exclude nanoftp.c and nanohttp.c, and the trio library. +# We deliberately exclude nanoftp.c and nanohttp.c, the trio library, and zlib. common_SRC_FILES := SAX.c entities.c encoding.c error.c \ parserInternals.c parser.c tree.c hash.c list.c xmlIO.c \ xmlmemory.c uri.c valid.c xlink.c HTMLparser.c HTMLtree.c \ @@ -43,7 +43,7 @@ common_SRC_FILES := SAX.c entities.c encoding.c error.c \ buf.c xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c \ xmlreader.c relaxng.c dict.c SAX2.c \ xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c xmlmodule.c \ - schematron.c xzlib.c + schematron.c common_C_INCLUDES += \ $(LOCAL_PATH)/include \ diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlversion.h index d3e7137c..4e408a9d 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 @@ -210,7 +210,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 @@ -396,7 +396,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether the Zlib support is compiled in */ -#if 1 +#if 0 #define LIBXML_ZLIB_ENABLED #endif |