diff options
| author | Neil Fuller <nfuller@google.com> | 2019-06-25 08:21:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-06-25 08:21:52 +0000 |
| commit | 18663755e0843154e8d2b8052d3475db9c176e20 (patch) | |
| tree | 14b6f418ae2df3e5d3318e6f8ce5b9a0e9a1e50c | |
| parent | a03fa1623ff0721f5e99fbaa26cfaa8c1388868a (diff) | |
| parent | 1ecf7f5ef5c55b231a074a165347d37c1cc43ade (diff) | |
| download | platform_external_libxml2-18663755e0843154e8d2b8052d3475db9c176e20.tar.gz platform_external_libxml2-18663755e0843154e8d2b8052d3475db9c176e20.tar.bz2 platform_external_libxml2-18663755e0843154e8d2b8052d3475db9c176e20.zip | |
Merge "Switch host variant to using ICU direct"android-o-mr1-iot-release-1.0.14
| -rw-r--r-- | Android.bp | 27 |
1 files changed, 17 insertions, 10 deletions
@@ -106,10 +106,6 @@ cc_defaults { "-DSTATIC_LIBXML=1", ], }, - shared: { - shared_libs: ["libandroidicu"], - export_shared_lib_headers: ["libandroidicu"], - }, } cc_library { @@ -121,12 +117,23 @@ cc_library { }, host_supported: true, target: { - vendor: { - exclude_shared_libs: ["libandroidicu"], - }, - host: { - shared_libs: ["libandroidicu"], - }, + android: { + shared_libs: ["libandroidicu"], + export_shared_lib_headers: ["libandroidicu"], + }, + host: { + shared_libs: [ + "libicui18n", + "libicuuc", + ], + export_shared_lib_headers: [ + "libicui18n", + "libicuuc", + ], + }, + vendor: { + exclude_shared_libs: ["libandroidicu"], + }, }, } |