commit ad63650a5af2d03d6aa39d857b0309046a6db44d
author Neil Fuller <nfuller@google.com> Tue May 07 20:33:37 2019 +0100
committer Neil Fuller <nfuller@google.com> Mon Jul 01 10:10:16 2019 +0000
tree a8b3575990c8646035bc3c74cb29429f5223e938
parent 256f7714f9663affaf5b70c4e1e8054b804b1af3

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
Exempt-From-Owner-Approval: Already approved internally
Change-Id: I55ff16556c2bd6f2d12b6cd39d732649b03be9c1
Merged-In: I55ff16556c2bd6f2d12b6cd39d732649b03be9c1

Android.bp

diff --git a/Android.bp b/Android.bp
index 93ce028..cedf4d2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -105,11 +105,16 @@
     target: {
         android: {
             shared_libs: [
+                "libandroidicu",
                 "libcutils",
                 "libutils",
             ],
         },
         host: {
+            shared_libs: [
+                "libicui18n",
+                "libicuuc",
+            ],
             static_libs: [
                 "libcutils",
                 "libutils",
@@ -121,7 +126,6 @@
     },
 
     shared_libs: [
-        "libandroidicu",
         "liblog",
     ],