Merge "Switch host variant to using ICU direct"android-o-mr1-iot-release-1.0.14

1 files changed, 11 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index dfb8a75..e4d9df1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -93,7 +93,6 @@ cc_library_shared {
     ],
     shared_libs: [
         "libremote-processor",
-        "libandroidicu",
     ],
     static_libs: [
         "libpfw_utility",
@@ -182,6 +181,17 @@ cc_library_shared {
         "upstream/xmlserializer/XmlStreamDocSink.cpp",
         "upstream/parameter/CommandHandlerWrapper.cpp",
     ],
+    target: {
+        android: {
+            shared_libs: ["libandroidicu"],
+        },
+        host: {
+            shared_libs: [
+                "libicui18n",
+                "libicuuc",
+            ],
+        },
+    },
 }
 
 cc_binary {