Merge "Update references to the new ART APEX."
diff --git a/icu4c/source/common/Android.bp b/icu4c/source/common/Android.bp
index a2c8cbb..c6f1dec 100644
--- a/icu4c/source/common/Android.bp
+++ b/icu4c/source/common/Android.bp
@@ -75,8 +75,11 @@
//
// Build for the host and target.
+// Allow static builds for host so that they can be statically
+// linked into libandroid_runtime. That enables libandroid_runtime to
+// be shipped on desktops as one file which saves space and complexity.
//
-cc_library_shared {
+cc_library {
name: "libicuuc",
host_supported: true,
native_bridge_supported: true,
@@ -84,6 +87,9 @@
defaults: ["libicuuc_defaults"],
target: {
android: {
+ static: {
+ enabled: false,
+ },
static_libs: ["libicuuc_stubdata"],
},
not_windows: {
diff --git a/icu4c/source/i18n/Android.bp b/icu4c/source/i18n/Android.bp
index 2c7be61..ad83fa3 100644
--- a/icu4c/source/i18n/Android.bp
+++ b/icu4c/source/i18n/Android.bp
@@ -67,8 +67,11 @@
//
// Build for the host and target (device).
+// Allow static builds for host so that they can be statically
+// linked into libandroid_runtime. That enables libandroid_runtime to
+// be shipped on desktops as one file which saves space and complexity.
//
-cc_library_shared {
+cc_library {
name: "libicui18n",
defaults: ["libicui18n_defaults"],
host_supported: true,
@@ -77,4 +80,11 @@
shared_libs: ["libicuuc"],
header_libs: ["libicui18n_headers"],
export_header_lib_headers: ["libicui18n_headers"],
+ target: {
+ android: {
+ static: {
+ enabled: false,
+ },
+ },
+ },
}