commit 4ab33ea1a3edca42b9d24ec6b66fd5b75ba8d8c7
author Victor Chang <vichang@google.com> Tue Sep 22 21:45:30 2020 +0100
committer Victor Chang <vichang@google.com> Wed Sep 23 14:34:26 2020 +0100
tree 63b610f7a54e1ff15fa485423b095d1f96ae7c01
parent 485a2a8e0498ad0145573847815819a3d5b9dc51

Use the new libicu.so provided in the NDK

Change to use #include <> to compile libjavacore on host

Bug: 160350521
Test: device boots
Change-Id: I1180a8ac5dbbdaa38ff43db8cc7fe5123c6cac27

NativeCode.bp

diff --git a/NativeCode.bp b/NativeCode.bp
index 0661664..fa42c72 100644
--- a/NativeCode.bp
+++ b/NativeCode.bp
@@ -63,10 +63,10 @@
         "dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp",
     ],
     shared_libs: [
-        "libandroidicu",
         "libandroidio",
         "libbase",
         "libcrypto",
+        "libicu",
         "libexpat",
         "libnativehelper",
         "libz",
@@ -130,6 +130,7 @@
     shared_libs: [
         "libandroidio",
         "libcrypto",
+        "libicu",
         "libnativehelper",
         "libz",
     ],
@@ -146,15 +147,9 @@
         },
         android: {
             shared_libs: [
-                "libandroidicu",
                 "libdl_android",
             ],
         },
-        host: {
-            shared_libs: [
-                "libicuuc",
-            ],
-        },
     },
 
     notice: "ojluni/NOTICE",