commit b8ec920468c5ab986b41b8cc7e061a64f3c8157a
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Thu Oct 15 18:50:13 2020 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Thu Oct 15 18:50:13 2020 +0000
tree ae13eca894dc5292bfe58c2a6feebbf9a8326ec3
parent 0c24204db8ccc8ffe57f7b043291b7cca00bdbd5
parent a492614a33cab849747211e7f2c5adfd046c3a9b

Snap for 6908147 from a492614a33cab849747211e7f2c5adfd046c3a9b to s-keystone-qcom-release

Change-Id: Ifc26023ba980cbde5cd33226ea14183be7ee2686

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..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"