Merge "Switch host variant to using ICU direct" am: 18663755e0ndk-sysroot-r21

am: 32fec772f9

Change-Id: If493fee0f4d2047ad14dedfec4a1323e6181f1e6

1 files 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"],
+       },
     },
 }