Bug 624422 - Let plugin-container load libmozgtk2. r=glandium

ipc/glue/GeckoChildProcessHost.cpp

@@ -574,6 +574,22 @@ GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExt
       } else {
           newEnvVars["LD_LIBRARY_PATH"] = path.get();
       }
+
+#  if (MOZ_WIDGET_GTK == 3)
+      const char *ld_preload = PR_GetEnv("LD_PRELOAD");
+      nsCString new_ld_preload;
+
+      new_ld_preload.Assign(path.get());
+      new_ld_preload.AppendLiteral("/" DLL_PREFIX "mozgtk2" DLL_SUFFIX);
+
+      if (ld_preload && *ld_preload) {
+          new_ld_preload.AppendLiteral(":");
+          new_ld_preload.Append(ld_preload);
+      }
+      newEnvVars["LD_PRELOAD"] = new_ld_preload.get();
+#  endif // MOZ_WIDGET_GTK
+
+
 # elif OS_MACOSX
       newEnvVars["DYLD_LIBRARY_PATH"] = path.get();
       // XXX DYLD_INSERT_LIBRARIES should only be set when launching a plugin

ipc/glue/moz.build

@@ -140,7 +140,8 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
-for var in ('MOZ_CHILD_PROCESS_NAME', 'MOZ_CHILD_PROCESS_BUNDLE'):
+for var in ('MOZ_CHILD_PROCESS_NAME', 'MOZ_CHILD_PROCESS_BUNDLE',
+            'DLL_PREFIX', 'DLL_SUFFIX'):
     DEFINES[var] = '"%s"' % CONFIG[var]
 
 LOCAL_INCLUDES += [