diff options
| author | Xin Li <delphij@google.com> | 2022-03-08 00:18:24 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2022-03-08 00:18:24 +0000 |
| commit | 87d0386a89c6b62242eb628d0d0defaa11870c69 (patch) | |
| tree | c0e270f5a5a7a3510e9297cd710f4884052688be | |
| parent | 17d6f27060ba5733c3c945162ceb91440e5cf27f (diff) | |
| parent | 5ed511b3d7290eb4382a3b4e24600e98f7c4a30a (diff) | |
| download | native_bridge_support-87d0386a89c6b62242eb628d0d0defaa11870c69.tar.gz | |
Merge Android 12L
Bug: 222710654
Merged-In: Ida76321ddb16fb47ba5204d106e7e6c2f1bb8457
Change-Id: I732d2684803b588d42a2726eba4c8594f8db03cf
| -rw-r--r-- | linker/linker_translate_path.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ bool translateSystemPathToApexPath(const char* name, std::string* out_name) { 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"), |