| commit | d95f9b97197f3dec891323f9f30cf63bf09639c9 | [log] [tgz] |
|---|---|---|
| author | Martin Stjernholm <mast@google.com> | Mon Apr 12 18:27:20 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 12 18:27:20 2021 +0000 |
| tree | f0ee8a13a03bd755a73967a3a61be74437e250d3 | |
| parent | 385160e999d5bb5989f44cb568e844b17582a1c0 [diff] | |
| parent | 3cabde281974234573b1ee223bcffe90ac332d7e [diff] |
Merge "libdexfile_external is replaced by libdexfile (reland 2)." am: 8146f21745 am: 20df86b2e3 am: 3cabde2819 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1671829 Change-Id: I74c25e5ca981a6fc57438971339345c4839301de
diff --git a/rootdir/etc/linker.config.json b/rootdir/etc/linker.config.json index 83cb6ff..d9f5526 100644 --- a/rootdir/etc/linker.config.json +++ b/rootdir/etc/linker.config.json
@@ -1,8 +1,7 @@ { "requireLibs": [ - // Keep in sync with the "platform" namespace in art/build/apex/ld.config.txt. - "libdexfile_external.so", - "libdexfiled_external.so", + "libdexfile.so", + "libdexfiled.so", "libnativebridge.so", "libnativehelper.so", "libnativeloader.so",