commit 0c717dd1c56bd29cf860d0feda8e629dab2cadb3
author Logan Chien <loganchien@google.com> Wed Mar 28 18:31:07 2012 +0800
committer Shih-wei Liao <sliao@google.com> Fri Apr 06 17:03:33 2012 -0700
tree a587807a9821ba6986e56fc9d3fed68540e41268
parent ccb7bf1271560783adccddb2ab74c53d0efd3fd1

Add ELF loader to OatFile.

Change-Id: I062c3cc78ff9a35d0efcbc9451e7e7ccb055667b

src/oatdump.cc

diff --git a/src/oatdump.cc b/src/oatdump.cc
index aa63ef5..978060d 100644
--- a/src/oatdump.cc
+++ b/src/oatdump.cc
@@ -1257,7 +1257,8 @@
   }
 
   if (oat_filename != NULL) {
-    OatFile* oat_file = OatFile::Open(oat_filename, oat_filename, NULL);
+    OatFile* oat_file =
+        OatFile::Open(oat_filename, oat_filename, NULL, OatFile::kRelocNone);
     if (oat_file == NULL) {
       fprintf(stderr, "Failed to open oat file from %s\n", oat_filename);
       return EXIT_FAILURE;
@@ -1265,6 +1266,7 @@
     OatDumper oat_dumper(*host_prefix.get(), *oat_file);
     oat_dumper.Dump(*os);
 
+#if defined(ART_USE_LLVM_COMPILER)
     if (!elf_filename_prefix.empty()) {
       uint32_t elf_image_count = oat_file->GetOatHeader().GetElfImageCount();
       for (uint32_t i = 0; i < elf_image_count; ++i) {
@@ -1281,6 +1283,7 @@
         }
       }
     }
+#endif
     return EXIT_SUCCESS;
   }