diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-10 07:32:43 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-10 07:32:43 +0000 |
| commit | accc7f33b72e5332894b00bbfed5dbc94c309afb (patch) | |
| tree | 06dca8eccc31c5c7090c9fef6a0d1634008e05c6 | |
| parent | 78d3fa18c2f5297926378c826450334ec3369d4b (diff) | |
| parent | d8ecd12ad7e975dd8912ccd93efb67e7e2034551 (diff) | |
| download | libxml2-oreo-mr1-vts-release.tar.gz | |
release-request-7f84484c-eec6-4577-8d5a-55079be4f3c5-for-git_oc-mr1-release-4262309 snap-temp-L02100000091441105android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r8android-8.1.0_r7android-8.1.0_r6android-8.1.0_r5android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1oreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release
Change-Id: I8e399d935a86dbcfda7cc589d6698270484e530f
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | include/libxml/xmlversion.h | 7 |
2 files changed, 12 insertions, 1 deletions
@@ -34,6 +34,9 @@ cc_library { name: "libxml2", vendor_available: true, + vndk: { + enabled: true, + }, host_supported: true, srcs: [ "SAX.c", @@ -94,6 +97,9 @@ cc_library { host: { host_ldlibs: ["-ldl"], }, + vendor: { + exclude_shared_libs: ["libicuuc"], + }, }, shared_libs: ["libicuuc"], export_shared_lib_headers: ["libicuuc"], diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlversion.h index c8163c61..eb18ea0c 100644 --- a/include/libxml/xmlversion.h +++ b/include/libxml/xmlversion.h @@ -286,9 +286,14 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * LIBXML_ICU_ENABLED: * * Whether icu support is available + * + * This is disabled when libxml2 is built for the VNDK. + * libicuuc.so isn't available in the VNDK. */ -#if 1 +#ifndef __ANDROID_VNDK__ #define LIBXML_ICU_ENABLED +#else +#undef LIBXML_ICU_ENABLED #endif /** |