Revert "Use dlopen to load oat files."
This reverts commit 49e1fabc85480f01077f3cc10e8ba6ada6e4befa.
Change-Id: If49e8b60c458a992519b7fdabe02e7d53830edab
diff --git a/runtime/oat_file.cc b/runtime/oat_file.cc
index 55a2fbb..6fda790 100644
--- a/runtime/oat_file.cc
+++ b/runtime/oat_file.cc
@@ -21,9 +21,6 @@
#include <unistd.h>
#include <cstdlib>
-#ifndef __APPLE__
-#include <link.h> // for dl_iterate_phdr.
-#endif
#include <sstream>
// dlopen_ext support from bionic.
@@ -38,7 +35,6 @@
#include "elf_file.h"
#include "elf_utils.h"
#include "oat.h"
-#include "mem_map.h"
#include "mirror/class.h"
#include "mirror/object-inl.h"
#include "os.h"
@@ -49,13 +45,13 @@
namespace art {
// Whether OatFile::Open will try DlOpen() first. Fallback is our own ELF loader.
-static constexpr bool kUseDlopen = true;
+static constexpr bool kUseDlopen = false;
// Whether OatFile::Open will try DlOpen() on the host. On the host we're not linking against
// bionic, so cannot take advantage of the support for changed semantics (loading the same soname
// multiple times). However, if/when we switch the above, we likely want to switch this, too,
// to get test coverage of the code paths.
-static constexpr bool kUseDlopenOnHost = true;
+static constexpr bool kUseDlopenOnHost = false;
// For debugging, Open will print DlOpen error message if set to true.
static constexpr bool kPrintDlOpenErrorMessage = false;
@@ -214,15 +210,6 @@
bool OatFile::Dlopen(const std::string& elf_filename, uint8_t* requested_base,
const char* abs_dex_location, std::string* error_msg) {
-#ifdef __APPLE__
- // The dl_iterate_phdr syscall is missing. There is similar API on OSX,
- // but let's fallback to the custom loading code for the time being.
- UNUSED(elf_filename);
- UNUSED(requested_base);
- UNUSED(abs_dex_location);
- UNUSED(error_msg);
- return false;
-#else
std::unique_ptr<char> absolute_path(realpath(elf_filename.c_str(), nullptr));
if (absolute_path == nullptr) {
*error_msg = StringPrintf("Failed to find absolute path for '%s'", elf_filename.c_str());
@@ -230,7 +217,7 @@
}
#ifdef HAVE_ANDROID_OS
android_dlextinfo extinfo;
- extinfo.flags = ANDROID_DLEXT_FORCE_LOAD | ANDROID_DLEXT_FORCE_FIXED_VADDR;
+ extinfo.flags = ANDROID_DLEXT_FORCE_LOAD;
dlopen_handle_ = android_dlopen_ext(absolute_path.get(), RTLD_NOW, &extinfo);
#else
dlopen_handle_ = dlopen(absolute_path.get(), RTLD_NOW);
@@ -277,27 +264,7 @@
bss_end_ += sizeof(uint32_t);
}
- // Ask the linker where it mmaped the file and notify our mmap wrapper of the regions.
- struct dl_iterate_context {
- static int callback(struct dl_phdr_info *info, size_t /* size */, void *data) {
- auto* context = reinterpret_cast<dl_iterate_context*>(data);
- if (info->dlpi_name != nullptr && info->dlpi_name == context->so_name) {
- for (int i = 0; i < info->dlpi_phnum; i++) {
- if (info->dlpi_phdr[i].p_type == PT_LOAD) {
- auto vaddr = reinterpret_cast<uint8_t*>(info->dlpi_addr + info->dlpi_phdr[i].p_vaddr);
- MemMap::MapDummy(info->dlpi_name, vaddr, info->dlpi_phdr[i].p_memsz);
- }
- }
- }
- return 0;
- }
- std::string so_name;
- } context;
- context.so_name = elf_filename;
- dl_iterate_phdr(dl_iterate_context::callback, &context);
-
return Setup(abs_dex_location, error_msg);
-#endif // __APPLE__
}
bool OatFile::ElfFileOpen(File* file, uint8_t* requested_base, uint8_t* oat_file_begin,