commit f9e609f10cdf55391c35735f395ba68567c7cd23
author Jeff Hao <jeffhao@google.com> Fri Feb 15 16:36:29 2013 -0800
committer Jeff Hao <jeffhao@google.com> Fri Feb 15 16:36:29 2013 -0800
tree ac08c6cce08670ba47399b68850394a569c3c415
parent 69307dfee85c9861e354ad2bf5afef50b0fafe4b

Disable dlopen which doesn't work on MIPS.

Dlopen should be reenabled once we figure out why it doesn't work on MIPS.

Change-Id: I93f50436ec65da5f52b66c7f1d7df3be75e35ae5

src/elf_writer_test.cc

diff --git a/src/elf_writer_test.cc b/src/elf_writer_test.cc
index 57d7e14..341c602 100644
--- a/src/elf_writer_test.cc
+++ b/src/elf_writer_test.cc
@@ -35,7 +35,17 @@
   EXPECT_EQ(value, reinterpret_cast<void*>(ef->FindSymbolAddress(llvm::ELF::SHT_DYNSYM, name))); \
   EXPECT_EQ(value, ef->FindDynamicSymbolAddress(name)); \
 
-TEST_F(ElfWriterTest, dlsym) {
+/*
+ * TODO: Reenable dlopen when it works again on MIPS. It may have broken from this change:
+ * commit 818d98eb563ad5d7293b8b5c40f3dabf745e611f
+ * Author: Brian Carlstrom <bdc@google.com>
+ * Date:   Sun Feb 10 21:38:12 2013 -0800
+ *
+ *    Fix MIPS to use standard kPageSize=0x1000 section alignment for ELF sections
+ *
+ *    Change-Id: I905f0c5f75921a65bd7426a54d6258c780d85d0e
+ */
+TEST_F(ElfWriterTest, DISABLED_dlsym) {
   std::string elf_filename;
   if (IsHost()) {
     const char* host_dir = getenv("ANDROID_HOST_OUT");

src/oat_file.cc

diff --git a/src/oat_file.cc b/src/oat_file.cc
index b806df8..3a81914 100644
--- a/src/oat_file.cc
+++ b/src/oat_file.cc
@@ -60,10 +60,20 @@
                        byte* requested_base) {
   CHECK(!filename.empty()) << location;
   CheckLocation(location);
+  /*
+   * TODO: Reenable dlopen when it works again on MIPS. It may have broken from this change:
+   * commit 818d98eb563ad5d7293b8b5c40f3dabf745e611f
+   * Author: Brian Carlstrom <bdc@google.com>
+   * Date:   Sun Feb 10 21:38:12 2013 -0800
+   *
+   *    Fix MIPS to use standard kPageSize=0x1000 section alignment for ELF sections
+   *
+   *    Change-Id: I905f0c5f75921a65bd7426a54d6258c780d85d0e
   OatFile* result = OpenDlopen(filename, location, requested_base);
   if (result != NULL) {
     return result;
   }
+  */
   UniquePtr<File> file(OS::OpenFile(filename.c_str(), false, false));
   if (file.get() == NULL) {
     return NULL;