commit 5ea9d31156c02be80de10bf5cf29512f23d0dc8a
author Victor Chang <vichang@google.com> Thu Dec 09 10:44:14 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 09 10:44:14 2021 +0000
tree c4bb0532dc295856383ae448378d65172b994674
parent 0d6289ab17c2ddacce9e644006e7029a547353a9
parent 3a2eab0bbe6176255b70f524dacb5061c2dfff4a

Update native bridge stub for ICU 70 am: 4527775216 am: 3a2eab0bbe

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/1913343

Change-Id: I9ce112d9b96a29bd763ac8e90f2260730e64cbae

linker/linker_translate_path.cpp

diff --git a/linker/linker_translate_path.cpp b/linker/linker_translate_path.cpp
index b5f5816..99a9c97 100644
--- a/linker/linker_translate_path.cpp
+++ b/linker/linker_translate_path.cpp
@@ -90,8 +90,10 @@
     SYSTEM_LIB("libz.so"),
     // Apex/system after R.
     APEX_LIB("com.android.i18n", "libandroidicu.so"),
+    APEX_LIB("com.android.i18n", "libicu.so"),
     APEX_LIB("com.android.i18n", "libicui18n.so"),
     APEX_LIB("com.android.i18n", "libicuuc.so"),
+    APEX_LIB("com.android.neuralnetworks", "libneuralnetworks.so"),
     // Apex/system on R (see http://b/161958857).
     APEX_LIB("com.android.art", "libicui18n.so"),
     APEX_LIB("com.android.art", "libicuuc.so"),