commit 8b247625f58ba8a0f616594dc774089678aa57e3
author Victor Chang <vichang@google.com> Tue Sep 22 21:48:15 2020 +0100
committer vichang <vichang@google.com> Fri Oct 02 18:32:14 2020 +0000
tree ff2be8fba185515184eb9aa6190ca50cdd27b2bd
parent e177bf1d28c5f8386995b9afd6df55c76fd48257

Use the new libicu.so provided in the NDK

Bug: 160350521
Test: device boots
Test: art/build/apex/runtests.sh
Change-Id: I54ce31df8349b0c2f335a50efa117d11976c1b1d

Android.mk

diff --git a/Android.mk b/Android.mk
index 881344a..65fe320 100644
--- a/Android.mk
+++ b/Android.mk
@@ -579,11 +579,11 @@
   lib64/libssl.so \
 
 PRIVATE_I18N_APEX_DEPENDENCY_LIBS := \
-  lib/libandroidicu.so \
+  lib/libicu.so \
   lib/libicui18n.so \
   lib/libicu_jni.so \
   lib/libicuuc.so \
-  lib64/libandroidicu.so \
+  lib64/libicu.so \
   lib64/libicui18n.so \
   lib64/libicu_jni.so \
   lib64/libicuuc.so \

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 56ec3c3..2eec949 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -29,7 +29,7 @@
     libziparchive libjavacore libandroidio libopenjdkd liblz4 liblzma, \
     $(call intermediates-dir-for,SHARED_LIBRARIES,$(lib),HOST)/$(lib).so:lib64/$(lib).so \
     $(call intermediates-dir-for,SHARED_LIBRARIES,$(lib),HOST,,2ND)/$(lib).so:lib/$(lib).so) \
-  $(foreach lib, libcrypto libz libicuuc libicui18n libandroidicu libexpat, \
+  $(foreach lib, libcrypto libz libicu libicuuc libicui18n libexpat, \
     $(call intermediates-dir-for,SHARED_LIBRARIES,$(lib),HOST)/$(lib).so:lib64/$(lib)-host.so \
     $(call intermediates-dir-for,SHARED_LIBRARIES,$(lib),HOST,,2ND)/$(lib).so:lib/$(lib)-host.so)
 

build/apex/art_apex_test.py

diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index eb1dd78..0a9c591 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -643,7 +643,7 @@
     self._checker.check_symlinked_first_executable('dex2oat')
 
     # Check exported native libraries for Managed Core Library.
-    self._checker.check_native_library('libandroidicu-host')
+    self._checker.check_native_library('libicu')
     self._checker.check_native_library('libandroidio')
 
     # Check internal libraries for Managed Core Library.

runtime/Android.bp

diff --git a/runtime/Android.bp b/runtime/Android.bp
index 2340cdb..a0f0c09 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -368,11 +368,9 @@
                 "runtime_android.cc",
                 "thread_android.cc",
             ],
-            header_libs: [
-                "libandroidicu_headers",
-            ],
             shared_libs: [
                 "libdl_android",
+                "libicu",
                 "libz", // For adler32.
             ],
         },