commit 99de0be2588525b5668c81e2b0fc93d96d0c971a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 16 15:54:33 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 16 15:54:33 2021 +0000
tree a0512b76b8869de19351ca17599833f6e14ea31d
parent 0f5e2bf79034b81a1bb263dccd088c7d6198886d
parent e6cd5611baca576192093e9405716096b232cbe9

Snap for 7920115 from e6cd5611baca576192093e9405716096b232cbe9 to mainline-tzdata3-release

Change-Id: I58df6c64f84e217f0b71d1929f447695d6f66fbf

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