| commit | 20df86b2e36ffc1bf830cac23951d509e0f1b62d | [log] [tgz] |
|---|---|---|
| author | Martin Stjernholm <mast@google.com> | Mon Apr 12 17:00:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 12 17:00:19 2021 +0000 |
| tree | 5e13476c116ddbd351cbaffac914a8d6232365c7 | |
| parent | 4b627e83b55da9e722357bd6203994608ad06e41 [diff] | |
| parent | 8146f2174572913af83f507308b2ce56342ab006 [diff] |
Merge "libdexfile_external is replaced by libdexfile (reland 2)." am: 8146f21745 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1671829 Change-Id: I960a0c20555bb987ad0fa6d7f38a60943a243528
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",