commit 893b4c819321253f36bdca778aeb5d3ada871ae7
author Andreas Gampe <agampe@google.com> Wed Dec 02 19:57:26 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 02 19:57:26 2015 +0000
tree c73ad870395d3ff8e93d246419359f969950fd76
parent c62f6970cbd646946f0b38932e16d30ef711a77f
parent 5337bbfbd1cd502bb2842698a6b2a543ab6a6c32

Merge "ART: Fix Mac build"
am: 5337bbfbd1

* commit '5337bbfbd1cd502bb2842698a6b2a543ab6a6c32':
  ART: Fix Mac build

runtime/oat_file.cc

diff --git a/runtime/oat_file.cc b/runtime/oat_file.cc
index 5fbede5..83e594b 100644
--- a/runtime/oat_file.cc
+++ b/runtime/oat_file.cc
@@ -585,6 +585,11 @@
 }
 
 void DlOpenOatFile::PreSetup(const std::string& elf_filename) {
+#ifdef __APPLE__
+  UNUSED(elf_filename);
+  LOG(FATAL) << "Should not reach here.";
+  UNREACHABLE();
+#else
   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);
@@ -624,6 +629,7 @@
     PrintFileToLog("/proc/self/maps", LogSeverity::WARNING);
     LOG(ERROR) << "File " << elf_filename << " loaded with dlopen but can not find its mmaps.";
   }
+#endif
 }
 
 ////////////////////////////////////////////////