commit 4ad72f89b12fe0157074a253190f6aa2cbfe15ac
author David Turner <digit@android.com> Mon Mar 29 15:49:42 2010 -0700
committer Android Code Review <code-review@android.com> Mon Mar 29 15:49:42 2010 -0700
tree f1b76dea170bdd2b4a107034958fd82de3c2eb2c
parent 8ab5b02b5f58d9b2f050a98b189284a3d6263d7b
parent 3cab22c8cf0dcf30718a1452ce9cbb637876cea3

Merge "linker: fix the undefined weak symbols issue"

linker/linker.c

diff --git a/linker/linker.c b/linker/linker.c
index f5294d9..87fb19b 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -471,7 +471,7 @@
             DEBUG("%5d %s: looking up %s in %s\n",
                   pid, si->name, name, lsi->name);
             s = _do_lookup_in_so(lsi, name, &elf_hash);
-            if(s != NULL)
+            if ((s != NULL) && (s->st_shndx != SHN_UNDEF))
                 goto done;
         }
     }