diff options
| author | Ulyana Trafimovich <skvadrik@google.com> | 2021-04-09 16:45:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-09 16:45:24 +0000 |
| commit | 8dd2ea72df675bafad4a2bf217618a5bfef89f9f (patch) | |
| tree | d0791766a96c45a9ad50b94bb425757bbab20b85 | |
| parent | 55fbcb3a7b3e25f4e93d872c02c8d3ca548ce343 (diff) | |
| parent | f3f26550236830930af010887b62806a1f8e4006 (diff) | |
| download | core-8dd2ea72df675bafad4a2bf217618a5bfef89f9f.tar.gz | |
Merge "Revert "libdexfile_external is replaced by libdexfile (reland)."" am: 60b9b4a467 am: f3f2655023temp_ab_7272582
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1671708
Change-Id: I98082b166a27f080e645bca8923ea3d14329f169
| -rw-r--r-- | rootdir/etc/linker.config.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rootdir/etc/linker.config.json b/rootdir/etc/linker.config.json index d9f552651..83cb6ff13 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", |