commit f0b38a3fc9f26fd5d712e0f7a2d6fa127afe631c
author The Android Automerger <android-build@google.com> Thu Jan 08 09:31:57 2015 -0800
committer The Android Automerger <android-build@google.com> Thu Jan 08 09:31:57 2015 -0800
tree 4bab62bf0ca7a5591109284a4a69c3725b884675
parent d9e211ca1fcf8bb78a1e1de9e54fe7c8d0a01518
parent ecb7dcc0849320ff0810324859a019f839e6835d

merge in lmp-mr1-release history after reset to lmp-mr1-dev

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 35c8cbd..54867dc 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -2413,7 +2413,10 @@
 
   somain = si;
 
-  si->PrelinkImage();
+  if (!si->PrelinkImage()) {
+    __libc_format_fd(2, "CANNOT LINK EXECUTABLE: %s\n", linker_get_error_buffer());
+    exit(EXIT_FAILURE);
+  }
 
   // Load ld_preloads and dependencies.
   StringLinkedList needed_library_name_list;