Bug 905668 - Add browser's Shumway extension to Android Nightly. r=mfinkle, r=gps

mobile/android/app/mobile.js

@@ -572,6 +572,11 @@ pref("media.preload.auto", 2);    // preload metadata if preload=auto
 pref("image.mem.decodeondraw", true);
 pref("image.mem.min_discard_timeout_ms", 10000);
 
+#ifdef NIGHTLY_BUILD
+// Shumway component (SWF player) is disabled by default. Also see bug 904346.
+pref("shumway.disabled", true);
+#endif
+
 // enable touch events interfaces
 pref("dom.w3c_touch_events.enabled", 1);
 

mobile/android/chrome/content/browser.js

@@ -65,6 +65,11 @@ XPCOMUtils.defineLazyServiceGetter(this, "uuidgen",
                                    "@mozilla.org/uuid-generator;1",
                                    "nsIUUIDGenerator");
 
+#ifdef NIGHTLY_BUILD
+XPCOMUtils.defineLazyModuleGetter(this, "ShumwayUtils",
+                                  "resource://shumway/ShumwayUtils.jsm");
+#endif
+
 // Lazily-loaded browser scripts:
 [
   ["SelectHelper", "chrome://browser/content/SelectHelper.js"],
@@ -341,6 +346,9 @@ var BrowserApp = {
 #ifdef ACCESSIBILITY
     AccessFu.attach(window);
 #endif
+#ifdef NIGHTLY_BUILD
+    ShumwayUtils.init();
+#endif
 
     // Init LoginManager
     Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);

mobile/android/extensions/Makefile.in

@@ -0,0 +1,27 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+include $(topsrcdir)/config/rules.mk
+
+SHUMWAY_BROWSER_EXTENSION = $(topsrcdir)/browser/extensions/shumway
+
+exclude_files = \
+  test \
+  $(NULL)
+
+ifdef NIGHTLY_BUILD
+$(FINAL_TARGET)/chrome/shumway.manifest: $(GLOBAL_DEPS)
+	$(call py_action,buildlist,$@ "manifest shumway/chrome.manifest")
+
+libs:: $(SHUMWAY_BROWSER_EXTENSION) $(GLOBAL_DEPS)
+	$(PYTHON) $(topsrcdir)/config/nsinstall.py \
+	  $(SHUMWAY_BROWSER_EXTENSION) \
+          $(foreach exclude,$(exclude_files), -X $(SHUMWAY_BROWSER_EXTENSION)/$(exclude)) \
+          $(FINAL_TARGET)/chrome
+
+libs:: $(FINAL_TARGET)/chrome/shumway.manifest
+	$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest "manifest chrome/shumway.manifest")
+endif
+
+

mobile/android/extensions/moz.build

@@ -0,0 +1,6 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+

mobile/android/installer/package-manifest.in

@@ -442,6 +442,10 @@
 ; [Browser Chrome Files]
 @BINPATH@/chrome/browser@JAREXT@
 @BINPATH@/chrome/browser.manifest
+#ifdef NIGHTLY_BUILD
+@BINPATH@/chrome/shumway.manifest
+@BINPATH@/chrome/shumway/*
+#endif
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png

mobile/android/moz.build

@@ -17,6 +17,7 @@ DIRS += [
     'app',
     'fonts',
     'geckoview_library',
+    'extensions',
 ]
 
 if not CONFIG['LIBXUL_SDK']: