Bug 1186522 - remove requirement of signed add-ons for beta builds, r=mossop
authorJordan Lund <jlund@mozilla.com>
Sun, 09 Aug 2015 16:04:06 -0700
changeset 257036 a6f105aba8d22e793d853bced35605258b4fa936
parent 257035 c2183af62a8d095b43ae3b34e535a72a79696b4a
child 257037 b41dbdb8e871cf8528571a16272b05fc6449bc82
push idunknown
push userunknown
push dateunknown
reviewersmossop
bugs1186522
milestone42.0a1
Bug 1186522 - remove requirement of signed add-ons for beta builds, r=mossop
browser/confvars.sh
mobile/android/confvars.sh
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -61,15 +61,8 @@ MOZ_WEBGL_CONFORMANT=1
 MOZ_PAY=1
 # Enable activities. These are used for FxOS developers currently.
 MOZ_ACTIVITIES=1
 MOZ_JSDOWNLOADS=1
 MOZ_WEBM_ENCODER=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" -o \
-          "$MOZ_UPDATE_CHANNEL" = "esr"; then
-    MOZ_REQUIRE_SIGNING=1
-  fi
-fi
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -107,14 +107,8 @@ export JS_GC_SMALL_CHUNK_SIZE=1
 
 # Enable FxAccount Avatar
 if test "$NIGHTLY_BUILD"; then
   MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES=1
 fi
 
 # 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