Merge "Use the new libicu.so provided in the NDK"

intuitionUI · Oct 2, 2020 · 6709de7 · 6709de7
2 parents f99502f + 4ab33ea
commit 6709de7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/NativeCode.bp b/NativeCode.bp
@@ -63,10 +63,10 @@ cc_library_shared {
         "dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp",
     ],
     shared_libs: [
-        "libandroidicu",
         "libandroidio",
         "libbase",
         "libcrypto",
+        "libicu",
         "libexpat",
         "libnativehelper",
         "libz",
@@ -130,6 +130,7 @@ cc_defaults {
     shared_libs: [
         "libandroidio",
         "libcrypto",
+        "libicu",
         "libnativehelper",
         "libz",
     ],
@@ -146,15 +147,9 @@ cc_defaults {
         },
         android: {
             shared_libs: [
-                "libandroidicu",
                 "libdl_android",
             ],
         },
-        host: {
-            shared_libs: [
-                "libicuuc",
-            ],
-        },
     },
 
     notice: "ojluni/NOTICE",

diff --git a/luni/src/main/native/ScopedIcuULoc.h b/luni/src/main/native/ScopedIcuULoc.h
@@ -19,7 +19,7 @@
 #include <nativehelper/JNIHelp.h>
 #include <nativehelper/ScopedUtfChars.h>
 
-#include "unicode/uloc.h"
+#include <unicode/uloc.h>
 
 
 static void getLocale(const char* localeName, std::string& locale, UErrorCode* status) {

diff --git a/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp b/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
@@ -31,10 +31,11 @@
 #include <nativehelper/ScopedUtfChars.h>
 #include <nativehelper/jni_macros.h>
 
+#include <unicode/char16ptr.h>
+#include <unicode/ustring.h>
+
 #include "JniConstants.h"
 #include "JniException.h"
-#include "unicode/char16ptr.h"
-#include "unicode/ustring.h"
 
 #define BUCKET_COUNT 128