commit d47e74bb258724dd1396107e12212c8be950f853
author Victor Chang <vichang@google.com> Fri Sep 11 11:33:00 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 11 11:33:00 2020 +0000
tree f234da489445fdd8d7799334e5adc15cedf19951
parent 2a40b6dddd7fc0f4ca296b14291971828ffe4ab1
parent b840af1218574a50152d076eb46c3b86daddaef3

Add a new public library libicu.so am: 83c0652a23 am: b840af1218

Original change: https://android-review.googlesource.com/c/platform/packages/modules/RuntimeI18n/+/1418890

Change-Id: I613b20ac982bf50703766afc9aebd9b43be1c21a

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index c33e05b..63bfe30 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -33,8 +33,11 @@
     key: "com.android.i18n.key",
     native_shared_libs: [
         "libandroidicu",
+        "libicu",
         "libicui18n",
         "libicuuc",
+        // libicu_jni is not in jni_libs, but native_shared_libs because it's required to bootstrap
+        // the Java method System.loadLibrary.
         "libicu_jni",
         // TODO(b/122876336): Remove libpac.so once it's migrated to Webview.
         "libpac",

apex/manifest.json

diff --git a/apex/manifest.json b/apex/manifest.json
index 08bfb5f..0755d6c 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -3,6 +3,7 @@
   "version": 1,
   "provideNativeLibs": [
     "libandroidicu.so",
+    "libicu.so",
     "libicui18n.so",
     "libicuuc.so",
     "libicu_jni.so"