From bbf86e6157ab98af7468ce5eb3292b6509a3cabd Mon Sep 17 00:00:00 2001
From: Dmitriy Ivanov <dimitry@google.com>
Date: Thu, 2 Oct 2014 13:44:20 -0700
Subject: [PATCH] Fixes to linker code after the conflict resolution

Change-Id: Icd0728604a865b73e7af0e0aee38971a612935f2
---
 linker/linker.cpp      | 16 ----------------
 linker/linker.h        |  2 --
 linker/linker_phdr.cpp | 16 ----------------
 3 files changed, 34 deletions(-)

diff --git a/linker/linker.cpp b/linker/linker.cpp
index fda168c52..6c30e1c32 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -779,22 +779,6 @@ static void for_each_dt_needed(const soinfo* si, F action) {
   }
 }
 
-static soinfo* load_library(LoadTaskList& load_tasks, const char* name, int rtld_flags, const android_dlextinfo* extinfo) {
-  int fd = -1;
-  ScopedFd file_guard(-1);
-
-  if (extinfo != nullptr && (extinfo->flags & ANDROID_DLEXT_USE_LIBRARY_FD) != 0) {
-    fd = extinfo->library_fd;
-  } else {
-    // Open the file.
-    fd = open_library(name);
-    if (fd == -1) {
-      DL_ERR("library \"%s\" not found", name);
-      return nullptr;
-    }
-  }
-}
-
 static soinfo* load_library(LoadTaskList& load_tasks, const char* name, int rtld_flags, const android_dlextinfo* extinfo) {
   int fd = -1;
   ScopedFd file_guard(-1);
diff --git a/linker/linker.h b/linker/linker.h
index 8afeb144d..f6e3a48ba 100644
--- a/linker/linker.h
+++ b/linker/linker.h
@@ -217,8 +217,6 @@ struct soinfo {
   ino_t get_st_ino();
   dev_t get_st_dev();
 
-
-
   int get_rtld_flags();
 
   soinfo_list_t& get_children();
diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp
index 2d03ac354..44c8e9e70 100644
--- a/linker/linker_phdr.cpp
+++ b/linker/linker_phdr.cpp
@@ -718,22 +718,6 @@ void phdr_table_get_dynamic_section(const ElfW(Phdr)* phdr_table, size_t phdr_co
       }
       return;
     }
-
-    *dynamic = reinterpret_cast<ElfW(Dyn)*>(load_bias + phdr->p_vaddr);
-    if (dynamic_count) {
-      *dynamic_count = (unsigned)(phdr->p_memsz / 8);
-    }
-    if (dynamic_flags) {
-      *dynamic_flags = phdr->p_flags;
-    }
-    return;
-  }
-  *dynamic = nullptr;
-  for (const ElfW(Phdr)* phdr = phdr_table, *phdr_limit = phdr + phdr_count; phdr < phdr_limit; phdr++) {
-    if (phdr->p_type == PT_DYNAMIC) {
-      *dynamic = reinterpret_cast<ElfW(Dyn)*>(load_bias + phdr->p_vaddr);
-      return;
-    }
   }
 }