Merge "Revert "libdexfile_external is being replaced by libdexfile.""
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",