| commit | 7aaed1de1ae96bc8f2557aeb44ccaaae13abbe77 | [log] [tgz] |
|---|---|---|
| author | Nikita Ioffe <ioffe@google.com> | Thu Apr 01 15:03:24 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 01 15:03:24 2021 +0000 |
| tree | f84936a73b97352296c2bcce409121926c47f5c0 | |
| parent | dcd76b6d7e04c046125fe1f5f1b3351c83c0f060 [diff] | |
| parent | 89e50ee521a6311db4fc7108fbf2f48d2a9fa9fa [diff] |
Merge "Revert "libdexfile_external is being replaced by libdexfile."" am: 89e50ee521 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1660249 Change-Id: Ia0cbcdbe0b07a144607a35b983a0b6f0e5c91955
diff --git a/rootdir/etc/linker.config.json b/rootdir/etc/linker.config.json index d9f5526..83cb6ff 100644 --- a/rootdir/etc/linker.config.json +++ b/rootdir/etc/linker.config.json
@@ -1,7 +1,8 @@ { "requireLibs": [ - "libdexfile.so", - "libdexfiled.so", + // Keep in sync with the "platform" namespace in art/build/apex/ld.config.txt. + "libdexfile_external.so", + "libdexfiled_external.so", "libnativebridge.so", "libnativehelper.so", "libnativeloader.so",