commit 00dce525530c5d26c20750863f3e9890b468787a
author Dmitriy Ivanov <dimitry@google.com> Mon Nov 03 21:15:25 2014 -0800
committer Dmitriy Ivanov <dimitry@google.com> Mon Nov 03 22:15:20 2014 -0800
tree 9a6c3e812cbbbfd03c007b7c8abd18f93b83f89b
parent eae09772558016836f1356816f4d1d0be498d74c

Revert "Fix relocation to look for symbols in local group"

This reverts commit fd2747bb585fc51b5ad56db09c0e9b66c7091a92.

Bug: 18222321
Bug: 18211780
Change-Id: I2d4ebab1e73b7277161af76b99f8249825b22d65

linker/linker.h

diff --git a/linker/linker.h b/linker/linker.h
index 222aca1..ebb4793 100644
--- a/linker/linker.h
+++ b/linker/linker.h
@@ -207,7 +207,7 @@
   void CallDestructors();
   void CallPreInitConstructors();
   bool PrelinkImage();
-  bool LinkImage(const soinfo_list_t& local_group, const android_dlextinfo* extinfo);
+  bool LinkImage(const android_dlextinfo* extinfo);
 
   void add_child(soinfo* child);
   void remove_all_links();
@@ -234,9 +234,9 @@
   void CallArray(const char* array_name, linker_function_t* functions, size_t count, bool reverse);
   void CallFunction(const char* function_name, linker_function_t function);
 #if defined(USE_RELA)
-  int Relocate(ElfW(Rela)* rela, unsigned count, const soinfo_list_t& local_group);
+  int Relocate(ElfW(Rela)* rela, unsigned count);
 #else
-  int Relocate(ElfW(Rel)* rel, unsigned count, const soinfo_list_t& local_group);
+  int Relocate(ElfW(Rel)* rel, unsigned count);
 #endif
 
  private: