commit b3c413d2e20e00c73e6d6f24b123af7ac9635f1c
author vichang <vichang@google.com> Thu Dec 03 11:34:58 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 03 11:34:58 2020 +0000
tree 3b943a3c45393b92b065dcecbe594f991a013f21
parent f0da6aa596510018ef16395343ff00fcb85c339c
parent c08cded4cdf10375557a87a39584a7a59f395e53

Merge "Build harfbuzz on top of libicu.so" am: ad7f0f5ae4 am: c08cded4cd

Original change: https://android-review.googlesource.com/c/platform/external/harfbuzz_ng/+/1508517

Change-Id: I2f321cb7a3f813b791c6707eb6cc2f320694ae9d

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",
     ],