commit 87730f4fc6d0a4635cafaa47b96a2b204ee1aed1
author vichang <vichang@google.com> Thu Jan 31 11:05:18 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 31 11:05:18 2019 +0000
tree 5bfb212c867a47150fc2f602b51f4a46ae1a16d6
parent f2c3243642b46f7f73529f7fa866fb3e809253ff
parent 3a647d23a7ed8c49929fd7958dcc9ee4ef3f12f7

Merge "Disable ICU in static libxml2 on Android"

Android.bp

diff --git a/Android.bp b/Android.bp
index a09eeb4..fde421f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -106,15 +106,23 @@
         "-Wno-unused-parameter",
     ],
     static: {
-        cflags: ["-fvisibility=hidden"],
+        cflags: [
+            "-fvisibility=hidden",
+            "-DSTATIC_LIBXML=1",
+        ],
+    },
+    shared: {
+        shared_libs: ["libandroidicu"],
+        export_shared_lib_headers: ["libandroidicu"],
     },
     target: {
         vendor: {
             exclude_shared_libs: ["libandroidicu"],
         },
+        host: {
+            shared_libs: ["libandroidicu"],
+        },
     },
-    shared_libs: ["libandroidicu"],
-    export_shared_lib_headers: ["libandroidicu"],
 }
 
 cc_binary_host {

include/libxml/xmlversion.h

diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlversion.h
index af022db..9f8978d 100644
--- a/include/libxml/xmlversion.h
+++ b/include/libxml/xmlversion.h
@@ -281,9 +281,19 @@
  * LIBXML_ICU_ENABLED:
  *
  * Whether icu support is available
+ *
+ * This is disabled when libxml2 is
+ * 1. built for the VNDK.
+ * libicuuc.so isn't available in the VNDK.
+ * 2. built as an static library on Android
+ * libicuuc.so isn't available for static linking.
  */
 #undef LIBXML_ICU_ENABLED
-#ifndef __ANDROID_VNDK__
+#ifdef __ANDROID_VNDK__
+#undef LIBXML_ICU_ENABLED
+#elif defined(__ANDROID__) && defined(STATIC_LIBXML)
+#undef LIBXML_ICU_ENABLED
+#else
 #define LIBXML_ICU_ENABLED
 #endif