commit 3f90fef4b07abfbf6d7a652a8bed1e47a8faafca
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Sun Sep 29 13:16:55 2019 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Sun Sep 29 13:16:55 2019 +0000
tree 14b6f418ae2df3e5d3318e6f8ce5b9a0e9a1e50c
parent f1de2c8d5f48c53afb862f2fe513f948f3c61bc1
parent 5d10c9313ed265cc6fc352479ac1db1094c0e212

Snap for 5907899 from 5d10c9313ed265cc6fc352479ac1db1094c0e212 to r-keystone-qcom-release

Change-Id: I91262808d01a9c4223407e7a9a505840215a11f9

Android.bp

diff --git a/Android.bp b/Android.bp
index db084f6..708549f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -106,10 +106,6 @@
             "-DSTATIC_LIBXML=1",
         ],
     },
-    shared: {
-        shared_libs: ["libandroidicu"],
-        export_shared_lib_headers: ["libandroidicu"],
-    },
 }
 
 cc_library {
@@ -121,12 +117,23 @@
     },
     host_supported: true,
     target: {
-        vendor: {
-            exclude_shared_libs: ["libandroidicu"],
-        },
-        host: {
-            shared_libs: ["libandroidicu"],
-        },
+       android: {
+           shared_libs: ["libandroidicu"],
+           export_shared_lib_headers: ["libandroidicu"],
+       },
+       host: {
+           shared_libs: [
+               "libicui18n",
+               "libicuuc",
+           ],
+           export_shared_lib_headers: [
+               "libicui18n",
+               "libicuuc",
+           ],
+       },
+       vendor: {
+           exclude_shared_libs: ["libandroidicu"],
+       },
     },
 }