commit 24053a461e7a20f34002262c1bb122023134989d
author Christopher Ferris <cferris@google.com> Mon Aug 19 17:45:09 2013 -0700
committer Christopher Ferris <cferris@google.com> Fri Sep 06 09:53:54 2013 -0700
tree 5da0ad5fe8822190483226140c7fba6a9f618395
parent df7436e709035fb6f5667980042848c8b4ca3e79

Add the dl_iterate_phdr function to libdl for arm.

Bug: 8410085

Merge from internal master.

(cherry-picked from cb491bc66dc0abc145930b09086eb9189a30f6c2)

Change-Id: I94ed51bc5d4c626df7552c0e85c31ccee2d6568f

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 623be29..0f20181 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -414,7 +414,7 @@
     return NULL;
 }
 
-#elif defined(ANDROID_X86_LINKER) || defined(ANDROID_MIPS_LINKER)
+#endif
 
 /* Here, we only have to provide a callback to iterate across all the
  * loaded libraries. gcc_eh does the rest. */
@@ -437,8 +437,6 @@
     return rv;
 }
 
-#endif
-
 static Elf32_Sym* soinfo_elf_lookup(soinfo* si, unsigned hash, const char* name) {
     Elf32_Sym* symtab = si->symtab;
     const char* strtab = si->strtab;