generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
This reverts commit fd2747bb58.

Bug: 18222321
Bug: 18211780
Change-Id: I2d4ebab1e73b7277161af76b99f8249825b22d65
This commit is contained in:
Dmitriy Ivanov
2014-11-03 21:15:25 -08:00
parent eae0977255
commit 00dce52553
14 changed files with 162 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
linker/linker.h
View File

@@ -207,7 +207,7 @@ struct soinfo {
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 @@ struct soinfo {
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: