commit ce727f234fc5b48ff1a11617aa0e76b8484d4108
author Christopher Ferris <cferris@google.com> Mon May 18 12:52:49 2015 -0700
committer The Android Automerger <android-build@google.com> Mon May 18 14:23:31 2015 -0700
tree cabe66bece0a450aefc1f3c508a08e03bfbd6da2
parent 0b535f4d8e08307122f08323fac93331b60cddf8

Fix incorrect check of bool returning function.

I changed elf_map_image from returning an int to returning bool.
Unfortunately, I forgot to change this one check. The result is
the relative pc of any relocation packed shared libraries is
wrong.

Bug: 21271675
Change-Id: I262e175c593d7c51f38df402f750ebf1c5c04ba7

src/os-linux.c

diff --git a/src/os-linux.c b/src/os-linux.c
index 3c675a4..cebe5aa 100644
--- a/src/os-linux.c
+++ b/src/os-linux.c
@@ -73,7 +73,7 @@
       if ((flags & (PROT_EXEC | PROT_READ)) == (PROT_EXEC | PROT_READ)
           && !(cur_map->flags & MAP_FLAGS_DEVICE_MEM))
         {
-          if (elf_map_image (&cur_map->ei, cur_map->path) == 0)
+          if (elf_map_image (&cur_map->ei, cur_map->path))
             {
               unw_word_t load_base;
               if (elf_w (get_load_base) (&cur_map->ei, offset, &load_base))