commit 698f5bb2be0e47ae53174cca370ae856bb922bd0
author Victor Chang <vichang@google.com> Mon Nov 23 19:24:43 2020 +0000
committer Victor Chang <vichang@google.com> Mon Nov 23 19:24:43 2020 +0000
tree 3b943a3c45393b92b065dcecbe594f991a013f21
parent 25f1e02489ff633b381e1d4a25fab95d71e2f513

Build harfbuzz on top of libicu.so

libicu.so is a public library exposed in NDK. Use libicu.so because
it provides enough APIs used by harfbuzz.

It helps deprecate libandroidicu.so and allow i18n module to be
mainline.

Bug: 174051744
Test: m droid
Change-Id: I1b3939520ba31e46d8feeb65785a89e5fe4fb417

Android.bp

diff --git a/Android.bp b/Android.bp
index 9f29062..609f883 100644
--- a/Android.bp
+++ b/Android.bp
@@ -108,16 +108,11 @@
     target: {
         android: {
             shared_libs: [
-                "libandroidicu",
                 "libcutils",
                 "libutils",
             ],
         },
         host: {
-            shared_libs: [
-                "libicui18n",
-                "libicuuc",
-            ],
             static_libs: [
                 "libcutils",
                 "libutils",
@@ -129,6 +124,7 @@
     },
 
     shared_libs: [
+        "libicu",
         "liblog",
     ],