diff options
| author | Xin Li <delphij@google.com> | 2022-03-08 06:53:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-03-08 06:53:24 +0000 |
| commit | 470cc632437c06d2f8105c7e5c71db886f5acabd (patch) | |
| tree | db1ef6245433d6f7cf56ab9efba322e2976682e6 | |
| parent | 3c740fa717f6f3a3c9e7bca388d76e25723b19a0 (diff) | |
| parent | 87d0386a89c6b62242eb628d0d0defaa11870c69 (diff) | |
| download | native_bridge_support-470cc632437c06d2f8105c7e5c71db886f5acabd.tar.gz | |
Merge "Merge Android 12L"
| -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"), |