diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-29 18:21:53 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-29 18:21:53 -0400 |
| commit | fe46030cdd97f9cf810630541df367dd2b85cae9 (patch) | |
| tree | e46fc6ca820662d33e1dd48ff8fd65a84eac7e83 /linker/linker.h | |
| parent | 7a9e06fa7e4e533074cde314f25dff3024f34a5d (diff) | |
| parent | 4a9afcb10151b083cd2d75253385615f459172ed (diff) | |
| download | bionic-fe46030cdd97f9cf810630541df367dd2b85cae9.zip bionic-fe46030cdd97f9cf810630541df367dd2b85cae9.tar.gz bionic-fe46030cdd97f9cf810630541df367dd2b85cae9.tar.bz2 | |
Merge changes I3bd27087,I0c9ec550,I3a0e5e86 into eclair
* changes:
bionic/linker: allow resolving of symbols from library back to executable
bionic/linker: change lookup() to return soinfo, not base
Revert "Revert "bionic/linker: fix symbol lookup during relocations""
Diffstat (limited to 'linker/linker.h')
| -rw-r--r-- | linker/linker.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linker/linker.h b/linker/linker.h index 69042c0..d289c81 100644 --- a/linker/linker.h +++ b/linker/linker.h @@ -203,7 +203,7 @@ extern soinfo libdl_info; soinfo *find_library(const char *name); unsigned unload_library(soinfo *si); Elf32_Sym *lookup_in_library(soinfo *si, const char *name); -Elf32_Sym *lookup(const char *name, unsigned *base); +Elf32_Sym *lookup(const char *name, soinfo **found); const char *linker_get_error(void); #ifdef ANDROID_ARM_LINKER |