From 1ecf7f5ef5c55b231a074a165347d37c1cc43ade Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Tue, 7 May 2019 20:53:41 +0100 Subject: Switch host variant to using ICU direct Switch host library variants to using ICU direct; libandroidicu should only be used on device. Bug: 130787951 Test: build only Change-Id: Ie65aadc407d6c758fb8a1502a605fbbc7f460a83 Merged-In: Ie65aadc407d6c758fb8a1502a605fbbc7f460a83 --- Android.bp | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/Android.bp b/Android.bp index db084f62..708549f9 100644 --- a/Android.bp +++ b/Android.bp @@ -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"], + }, }, } -- cgit v1.2.3