Revert "Use stable ICU symbols (non-version-specific suffix) in libopenjdk"
This reverts commit 8f37b14adfdc977ad08184c152d69db9d759c1e0.
Reason for revert: ART benchmark is broken
Change-Id: I85212250356aaa1476eef40e80e57249cde423be
diff --git a/NativeCode.bp b/NativeCode.bp
index 50e716c..a27fa74 100644
--- a/NativeCode.bp
+++ b/NativeCode.bp
@@ -128,6 +128,7 @@
shared_libs: [
"libandroidio",
"libcrypto",
+ "libicuuc",
"libnativehelper",
"libz",
],
@@ -143,14 +144,14 @@
],
},
android: {
- shared_libs: [
- "libandroidicu",
- "libdl_android",
+ cflags: [
+ // -DANDROID_LINK_SHARED_ICU4C to enable access to the full ICU4C.
+ // See external/icu/android_icu4c/include/uconfig_local.h
+ // for more information.
+ "-DANDROID_LINK_SHARED_ICU4C",
],
- },
- host: {
shared_libs: [
- "libicuuc",
+ "libdl_android",
],
},
},