Revert "Replace usage of ICU4C in bionic with ICU4X"
Revert submission 3511934-ICU4X-in-Bionic_2
Reason for revert: DroidMonitor: Culprit for http://b/400532776 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted changes: /q/submissionid:3511934-ICU4X-in-Bionic_2
Change-Id: I936ee9f33dee4cfbd849b0066ea7765f3e8b254a
diff --git a/libc/Android.bp b/libc/Android.bp
index e6f69c2..b5ff680 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -790,53 +790,6 @@
}
// ========================================================
-// 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
// ========================================================
@@ -917,6 +870,7 @@
"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",
@@ -1228,7 +1182,6 @@
whole_static_libs: [
"//external/llvm-libc:llvmlibc",
"libsystemproperties",
- "libicu4x_bionic",
],
cppflags: ["-Wold-style-cast"],
@@ -1480,6 +1433,7 @@
"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",
@@ -1498,6 +1452,7 @@
"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",
],