commit 97697a5572208c6753425cf4bb76e41d849e8696
author Xin Li <delphij@google.com> Thu Oct 08 17:23:15 2020 -0700
committer Xin Li <delphij@google.com> Thu Oct 08 17:23:15 2020 -0700
tree f97ee2ded5796c6c7b59761eaaeb6fc060c5ae18
parent 7749ed5e8435d0d0232053e8e8185308684ecf94
parent 598bd99f792ed512429e0fb0b17a17196812d8b4

Skip ab/6749736 in stage.

Merged-In: I644c2362f1a0da5caf2b217054cd84ca03eb3fcc
Change-Id: I32a9be5fb84a25d07e0e6b4fd8c379e729f9710e

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index c33e05b..caefc78 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",
@@ -75,6 +78,7 @@
     ],
     native_shared_libs: [
         "libandroidicu",
+        "libicu",
     ],
 }
 

apex/manifest.json

diff --git a/apex/manifest.json b/apex/manifest.json
index 08bfb5f..d1df127 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -2,7 +2,6 @@
   "name": "com.android.i18n",
   "version": 1,
   "provideNativeLibs": [
-    "libandroidicu.so",
     "libicui18n.so",
     "libicuuc.so",
     "libicu_jni.so"