commit af7f957ed4a8df740dcdd84540f0ae5434a2b884
author android-build-team Robot <android-build-team-robot@google.com> Tue Apr 28 20:24:02 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Apr 28 20:24:02 2020 +0000
tree f3e1739f666058e1674c1cb01332eed505134b41
parent 88367afef61e5a2ea09b82fb5621b0035e276c73
parent 5c6da22b1751b83076979c8d16f48054a7c58b19

Snap for 6439596 from 5c6da22b1751b83076979c8d16f48054a7c58b19 to qt-aml-tzdata-release

Change-Id: I5b11eb109f3979493a6c41c9116dba37300efd44

Android.bp

diff --git a/Android.bp b/Android.bp
index 95d9b70..93ce028 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,7 +51,7 @@
 //############################################################
 //   build the harfbuzz shared library
 //
-cc_library {
+cc_library_shared {
     name: "libharfbuzz_ng",
     host_supported: true,
     arch: {
@@ -105,16 +105,11 @@
     target: {
         android: {
             shared_libs: [
-                "libandroidicu",
                 "libcutils",
                 "libutils",
             ],
         },
         host: {
-            shared_libs: [
-                "libicui18n",
-                "libicuuc",
-            ],
             static_libs: [
                 "libcutils",
                 "libutils",
@@ -126,6 +121,7 @@
     },
 
     shared_libs: [
+        "libandroidicu",
         "liblog",
     ],