Revert^2 "Replace usage of ICU4C in bionic with ICU4X"
889f6585d824098854ed3157f60444606f49fa7a
Change-Id: Ic16a9518483d80d6de6ac1f9176606a503a7e72c
diff --git a/libc/Android.bp b/libc/Android.bp
index b5ff680..e6f69c2 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -790,6 +790,53 @@
}
// ========================================================
+// icu4x_bionic.a - Thin Rust wrapper around ICU4X
+// ========================================================
+
+rust_ffi_static {
+ name: "libicu4x_bionic",
+ crate_name: "icu4x_bionic",
+ crate_root: "bionic/icu4x.rs",
+ edition: "2021",
+ features: [],
+ rustlibs: [
+ "//external/rust/android-crates-io/crates/icu_casemap:libicu_casemap",
+ "//external/rust/android-crates-io/crates/icu_collections:libicu_collections",
+ "//external/rust/android-crates-io/crates/icu_properties:libicu_properties",
+ ],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ vendor_available: true,
+ product_available: true,
+ ramdisk_available: true,
+ vendor_ramdisk_available: true,
+ recovery_available: true,
+ native_bridge_supported: true,
+ sdk_version: "minimum",
+ defaults: ["linux_bionic_supported"],
+}
+
+// current rust implementation detail; will be removed as part of a larger cleanup later
+// go/android-mto-staticlibs-in-make
+cc_rustlibs_for_make {
+ name: "libstatic_rustlibs_for_make",
+ whole_static_libs: ["libicu4x_bionic"],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ vendor_available: true,
+ product_available: true,
+ ramdisk_available: true,
+ vendor_ramdisk_available: true,
+ recovery_available: true,
+ native_bridge_supported: true,
+ defaults: ["linux_bionic_supported"],
+}
+
+// ========================================================
// libc_bionic.a - home-grown C library code
// ========================================================
@@ -870,7 +917,6 @@
"bionic/grp_pwd_file.cpp",
"bionic/heap_zero_init.cpp",
"bionic/iconv.cpp",
- "bionic/icu_wrappers.cpp",
"bionic/ifaddrs.cpp",
"bionic/inotify_init.cpp",
"bionic/ioctl.cpp",
@@ -1182,6 +1228,7 @@
whole_static_libs: [
"//external/llvm-libc:llvmlibc",
"libsystemproperties",
+ "libicu4x_bionic",
],
cppflags: ["-Wold-style-cast"],
@@ -1433,7 +1480,6 @@
"bionic/android_mallopt.cpp",
"bionic/gwp_asan_wrappers.cpp",
"bionic/heap_tagging.cpp",
- "bionic/icu.cpp",
"bionic/malloc_common.cpp",
"bionic/malloc_common_dynamic.cpp",
"bionic/android_profiling_dynamic.cpp",
@@ -1452,7 +1498,6 @@
"bionic/android_mallopt.cpp",
"bionic/gwp_asan_wrappers.cpp",
"bionic/heap_tagging.cpp",
- "bionic/icu_static.cpp",
"bionic/malloc_common.cpp",
"bionic/malloc_limit.cpp",
],