am 880aed0b: am 1d548dc9: Merge "Print error when prelink fails for main executable"

* commit '880aed0b4defd7e30afcf29d4bcdf0bdd7a0bc64':
  Print error when prelink fails for main executable
This commit is contained in:
Dmitriy Ivanov 2015-01-08 00:21:33 +00:00 committed by Android Git Automerger
commit 7c16f56566

View File

@ -2717,7 +2717,10 @@ static ElfW(Addr) __linker_init_post_relocation(KernelArgumentBlock& args, ElfW(
somain = si;
si->prelink_image();
if (!si->prelink_image()) {
__libc_format_fd(2, "CANNOT LINK EXECUTABLE: %s\n", linker_get_error_buffer());
exit(EXIT_FAILURE);
}
// add somain to global group
si->set_dt_flags_1(si->get_dt_flags_1() | DF_1_GLOBAL);