java.lang.Character implemented using icu4c
Removed CharacterData* and CharacterName classes.
+ bugfixes from mnc
Bug: 25442844
Change-Id: I8c20cdf32ca3530dc425c8117c637769463c1f93
(cherry picked from commit 2614ae16db0daf146227484c8e712dcbcc11e964)
diff --git a/NativeCode.mk b/NativeCode.mk
index d25f750..eb2663c 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -117,7 +117,7 @@
# Define the rules.
LOCAL_SRC_FILES := $(openjdk_core_src_files)
LOCAL_C_INCLUDES := $(core_c_includes)
-LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libcrypto libssl libz
+LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libcrypto libicuuc libssl libz
LOCAL_SHARED_LIBRARIES += libart libnativehelper libdl
LOCAL_STATIC_LIBRARIES := $(core_static_libraries) libfdlibm
LOCAL_MODULE_TAGS := optional
@@ -205,7 +205,7 @@
LOCAL_SRC_FILES := $(openjdk_core_src_files)
LOCAL_C_INCLUDES := $(core_c_includes)
LOCAL_CFLAGS := -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DLINUX -D__GLIBC__ # Sigh.
-LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libcrypto-host libz-host
+LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libicuuc-host libcrypto-host libz-host
LOCAL_SHARED_LIBRARIES += libart libnativehelper
LOCAL_STATIC_LIBRARIES := $(core_static_libraries) libfdlibm
LOCAL_MODULE_TAGS := optional