Snap for 6439596 from e040d79711a7aabe472b9be796d57d4ef9006a19 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: I9eed152e70f7b2789c1b89bc2284f9cd8a75e329

1 files changed, 10 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index 708549f9..db084f62 100644
--- a/Android.bp
+++ b/Android.bp
@@ -106,6 +106,10 @@ cc_defaults {
             "-DSTATIC_LIBXML=1",
         ],
     },
+    shared: {
+        shared_libs: ["libandroidicu"],
+        export_shared_lib_headers: ["libandroidicu"],
+    },
 }
 
 cc_library {
@@ -117,23 +121,12 @@ cc_library {
     },
     host_supported: true,
     target: {
-       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"],
-       },
+        vendor: {
+            exclude_shared_libs: ["libandroidicu"],
+        },
+        host: {
+            shared_libs: ["libandroidicu"],
+        },
     },
 }