Snap for 5907899 from 5d10c9313ed265cc6fc352479ac1db1094c0e212 to r-keystone-qcom-release
Change-Id: I91262808d01a9c4223407e7a9a505840215a11f9
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"],
+ },
},
}