Backed out changeset 292d13beeb7b (bug 1186522) for Gaia unit test bustage.

browser/config/mozconfigs/linux64/nightly-no-add-on-sign

@@ -1,4 +0,0 @@
-# addon signing is checked but not required
-MOZ_REQUIRE_ADDON_SIGNING=0
-MOZ_ADDON_SIGNING=1
-. $topsrcdir/browser/config/mozconfigs/linux64/nightly

browser/confvars.sh

@@ -63,3 +63,6 @@ MOZ_PAY=1
 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

build/mozconfig.common

@@ -16,9 +16,4 @@ ac_add_options --enable-crashreporter
 
 ac_add_options --enable-release
 
-# Enable checking that add-ons are signed by the trusted root
-MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-1}
-# Disable enforcing that add-ons are signed by the trusted root
-MOZ_REQUIRE_ADDON_SIGNING=${MOZ_REQUIRE_ADDON_SIGNING-0}
-
 . "$topsrcdir/build/mozconfig.automation"

configure.in

@@ -3791,6 +3791,8 @@ MOZ_CONTENT_SANDBOX=
 MOZ_GMP_SANDBOX=
 MOZ_SANDBOX=1
 MOZ_BINARY_EXTENSIONS=
+MOZ_ADDON_SIGNING=
+MOZ_REQUIRE_SIGNING=
 
 case "$target_os" in
     mingw*)
@@ -8607,12 +8609,8 @@ AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
 AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_LINKER_EXTRACT)
 
-if test "$MOZ_ADDON_SIGNING" = 1; then
-  AC_DEFINE(MOZ_ADDON_SIGNING)
-fi
-if test "$MOZ_REQUIRE_ADDON_SIGNING" = 1; then
-  AC_DEFINE(MOZ_REQUIRE_ADDON_SIGNING)
-fi
+AC_SUBST(MOZ_ADDON_SIGNING)
+AC_SUBST(MOZ_REQUIRE_SIGNING)
 
 if test -n "$MOZ_BINARY_EXTENSIONS"; then
   AC_DEFINE(MOZ_BINARY_EXTENSIONS)

mobile/android/confvars.sh

@@ -108,6 +108,9 @@ export JS_GC_SMALL_CHUNK_SIZE=1
 # Enable Firefox Account avatars.
 MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES=1
 
+# Enable checking that add-ons are signed by the trusted root
+MOZ_ADDON_SIGNING=1
+
 # Enable the Switchboard A/B framework code.
 # Note: The framework is always included in the app. This flag controls
 # usage of the framework.

toolkit/mozapps/extensions/internal/XPIProvider.jsm

@@ -8060,7 +8060,7 @@ Object.defineProperty(this, "REQUIRE_SIGNING", {
   configurable: false,
   enumerable: false,
   writable: false,
-#ifdef MOZ_REQUIRE_ADDON_SIGNING
+#ifdef MOZ_REQUIRE_SIGNING
   value: true,
 #else
   value: false,

toolkit/mozapps/extensions/internal/moz.build

@@ -34,3 +34,9 @@ DEFINES['MOZ_EXTENSIONS_DB_SCHEMA'] = 17
 # Additional debugging info is exposed in debug builds
 if CONFIG['MOZ_EM_DEBUG']:
     DEFINES['MOZ_EM_DEBUG'] = 1
+
+if CONFIG['MOZ_ADDON_SIGNING']:
+    DEFINES['MOZ_ADDON_SIGNING'] = 1
+
+if CONFIG['MOZ_REQUIRE_SIGNING']:
+    DEFINES['MOZ_REQUIRE_SIGNING'] = 1