| commit | f3f26550236830930af010887b62806a1f8e4006 | [log] [tgz] |
|---|---|---|
| author | Ulyana Trafimovich <skvadrik@google.com> | Fri Apr 09 15:59:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 09 15:59:44 2021 +0000 |
| tree | d0791766a96c45a9ad50b94bb425757bbab20b85 | |
| parent | 0541141771abea0a2809b4d90e651d88d597a775 [diff] | |
| parent | 60b9b4a467a6978f8161bf074a2d41008b2a02a7 [diff] |
Merge "Revert "libdexfile_external is replaced by libdexfile (reland)."" am: 60b9b4a467 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1671708 Change-Id: Id627b0324fd88d069182059a566e353c06c5705b
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",