commit 98e84635915ba70417ffb99752636259baf3fdfe
author Scott Lobdell <slobdell@google.com> Thu Dec 16 23:04:15 2021 +0000
committer Scott Lobdell <slobdell@google.com> Thu Dec 16 23:11:16 2021 +0000
tree 64a0d1a86d7f9eac538352f665af156abe0b4385
parent 251b0d24b68c2cd11bf79193a76844795c9059fa
parent 2fa217d9b8f60f19713e85e681aa4731d6700c1f

Merge TP1A.211029.001

Change-Id: Ia5e8dfe3b83aaa0f223f611dcf1c33218148a867

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"),