commit f6ee33cee717f9878d3a43bf76c35547649676d7
author Nick Kralevich <nnk@google.com> Wed Jul 18 14:02:21 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Wed Jul 18 14:02:22 2012 -0700
tree 93d200becc2ae2e17794901b03ff69a5d32b5382
parent 3fd5e91e58ba40a7321a3f2c4c64970584e9bb56
parent 326e85eca6916eb904649f7bff65244a40088ba7

Merge "linker: Fix LD_PRELOADS for calling constructors"

linker/linker.c

diff --git a/linker/linker.c b/linker/linker.c
index 753ee89..b96e072 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -1649,6 +1649,7 @@
     unsigned *vecs = (unsigned*) (argv + argc + 1);
     unsigned *v;
     soinfo *si;
+    int i;
     struct link_map * map;
     const char *ldpath_env = NULL;
     const char *ldpreload_env = NULL;
@@ -1791,6 +1792,10 @@
         exit(-1);
     }
 
+    for(i = 0; preloads[i] != NULL; i++) {
+        soinfo_call_constructors(preloads[i]);
+    }
+
     soinfo_call_constructors(si);
 
 #if ALLOW_SYMBOLS_FROM_MAIN