Simplify the libc.a [lack of] icu support.
Change-Id: Ia9596d834b2d3144966f8f8879a39ba9243b9957
diff --git a/libc/Android.bp b/libc/Android.bp
index 80b24b4..d9be8a4 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1016,11 +1016,6 @@
"stdio/stdio_ext.cpp",
"stdio/vfscanf.cpp",
"stdio/vfwscanf.cpp",
-
- // TODO: why isn't this in a static-libc-only module?
- // This contains a weak stub implementation of __find_icu_symbol for wctype.cpp,
- // which will be overridden by the actual one in libc.so.
- "bionic/icu_static.cpp",
],
arch: {
@@ -1523,6 +1518,7 @@
srcs: [
"bionic/gwp_asan_wrappers.cpp",
"bionic/heap_tagging.cpp",
+ "bionic/icu_static.cpp",
"bionic/malloc_common.cpp",
"bionic/malloc_limit.cpp",
],
diff --git a/libc/bionic/icu_static.cpp b/libc/bionic/icu_static.cpp
index e81e291..cf24a38 100644
--- a/libc/bionic/icu_static.cpp
+++ b/libc/bionic/icu_static.cpp
@@ -29,6 +29,6 @@
#include "private/icu.h"
// We don't have dlopen/dlsym for static binaries yet.
-__attribute__((weak)) void* __find_icu_symbol(const char*) {
+void* __find_icu_symbol(const char*) {
return nullptr;
}