Bug 1168570: Enable add-on signing support in Android. r=margaret

--HG--
extra : rebase_source : eb8e48a3805068b9b23009b9f597712102efbee1
extra : amend_source : c739460458542a03557bda417aea231dee00a0e9

mobile/android/app/mobile.js

@@ -180,6 +180,8 @@ pref("xpinstall.whitelist.fileRequest", false);
 pref("xpinstall.whitelist.add", "addons.mozilla.org");
 pref("xpinstall.whitelist.add.180", "marketplace.firefox.com");
 
+pref("xpinstall.signatures.required", false);
+
 pref("extensions.enabledScopes", 1);
 pref("extensions.autoupdate.enabled", true);
 pref("extensions.autoupdate.interval", 86400);

mobile/android/confvars.sh

@@ -106,3 +106,12 @@ fi
 
 # Use the low-memory GC tuning.
 export JS_GC_SMALL_CHUNK_SIZE=1
+
+# Enable checking that add-ons are signed by the trusted root
+MOZ_ADDON_SIGNING=1
+if test "$MOZ_OFFICIAL_BRANDING"; then
+  if test "$MOZ_UPDATE_CHANNEL" = "beta" -o \
+          "$MOZ_UPDATE_CHANNEL" = "release"; then
+    MOZ_REQUIRE_SIGNING=1
+  fi
+fi