Bug 588607 - 3. Add support for the custom library loader to plugin-container, r=cjones a=blocking-fennec

--HG--
extra : rebase_source : 9e0fbf12f79495964febafaa3f0065805139db03

ipc/app/Makefile.in

@@ -51,10 +51,16 @@ CPPSRCS = \
   MozillaRuntimeMain.cpp \
   $(NULL)
 
+ifeq (Android,$(OS_TARGET))
+WRAP_MALLOC_CFLAGS =
+WRAP_MALLOC_LIB =
+CPPSRCS = MozillaRuntimeMainAndroid.cpp
+else
 LIBS += \
   $(XPCOM_LIBS) \
   $(NSPR_LIBS) \
   $(NULL)
+endif
 
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 
@@ -92,7 +98,9 @@ OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 v
 OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32)
 endif
 
+ifneq (Android,$(OS_TARGET))
 LIBS += $(JEMALLOC_LIBS)
+endif
 
 include $(topsrcdir)/config/rules.mk
 

ipc/app/MozillaRuntimeMainAndroid.cpp

@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: sw=4 ts=4 et :
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Plugin App.
+ *
+ * The Initial Developer of the Original Code is
+ *   Ben Turner <bent.mozilla@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Chris Jones <jones.chris.g@gmail.com>.
+ *   Michael Wu <mwu@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <dlfcn.h>
+#include <android/log.h>
+
+int
+main(int argc, char* argv[])
+{
+    // Check for the absolute minimum number of args we need to move
+    // forward here. We expect the last arg to be the child process type.
+    if (argc < 2)
+        return 1;
+
+    void *mozloader_handle = dlopen("libmozutils.so", RTLD_LAZY);
+    if (!mozloader_handle) {
+      __android_log_print(ANDROID_LOG_ERROR, "GeckoChildLoad",
+                          "Couldn't load mozloader because %s", dlerror());
+        return 1;
+    }
+
+    typedef int (*ChildProcessInit_t)(int, char**);
+    ChildProcessInit_t fChildProcessInit =
+        (ChildProcessInit_t)dlsym(mozloader_handle, "ChildProcessInit");
+    if (!fChildProcessInit) {
+        __android_log_print(ANDROID_LOG_ERROR, "GeckoChildLoad",
+                            "Couldn't load cpi_t because %s", dlerror());
+        return 1;
+    }
+
+    return fChildProcessInit(argc, argv);
+}