Bug 1186522 - force per checkin and release desktop firefox builds to…

… require signed add-ons on beta 47 r=mshal
mozilla · Apr 27, 2016 · 54248e8 · 54248e8
1 parent 2142735
commit 54248e8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 18 deletions.
diff --git a/browser/confvars.sh b/browser/confvars.sh
@@ -61,8 +61,5 @@ MOZ_ACTIVITIES=1
 MOZ_JSDOWNLOADS=1
 MOZ_RUST_MP4PARSE=1
 
-# Enable checking that add-ons are signed by the trusted root
-MOZ_ADDON_SIGNING=1
-
 # Include the DevTools client, not just the server (which is the default)
 MOZ_DEVTOOLS=all
diff --git a/build/mozconfig.common b/build/mozconfig.common
@@ -16,6 +16,11 @@ 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_SIGNING=${MOZ_REQUIRE_SIGNING-0}
+
 ac_add_options --enable-js-shell
 
 . "$topsrcdir/build/mozconfig.automation"
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
@@ -73,6 +73,3 @@ MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER=1
 
 # 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
diff --git a/old-configure.in b/old-configure.in
@@ -2731,8 +2731,6 @@ MOZ_CONTENT_SANDBOX=
 MOZ_GMP_SANDBOX=
 MOZ_SANDBOX=1
 MOZ_BINARY_EXTENSIONS=
-MOZ_ADDON_SIGNING=
-MOZ_REQUIRE_SIGNING=
 MOZ_DEVTOOLS=server
 
 case "$target_os" in
@@ -6760,13 +6758,19 @@ AC_SUBST(MOZ_FIX_LINK_PATHS)
 AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_LINKER_EXTRACT)
 
-AC_SUBST(MOZ_ADDON_SIGNING)
-AC_SUBST(MOZ_REQUIRE_SIGNING)
-
 if test -n "$MOZ_BINARY_EXTENSIONS"; then
   AC_DEFINE(MOZ_BINARY_EXTENSIONS)
 fi
 
+AC_SUBST(MOZ_ADDON_SIGNING)
+if test "$MOZ_ADDON_SIGNING" = 1; then
+  AC_DEFINE(MOZ_ADDON_SIGNING)
+fi
+AC_SUBST(MOZ_REQUIRE_SIGNING)
+if test "$MOZ_REQUIRE_SIGNING" = 1; then
+  AC_DEFINE(MOZ_REQUIRE_SIGNING)
+fi
+
 AC_SUBST(MOZ_JSDOWNLOADS)
 if test -n "$MOZ_JSDOWNLOADS"; then
   AC_DEFINE(MOZ_JSDOWNLOADS)

diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
@@ -127,7 +127,6 @@ for var in ('ANDROID_PACKAGE_NAME',
             DEFINES[var] = CONFIG[var]
 
 for var in ('MOZ_TOOLKIT_SEARCH',
-            'MOZ_REQUIRE_SIGNING',
             'MOZ_SYSTEM_NSS',
             'MOZ_UPDATER',
             'MOZ_SWITCHBOARD'):

diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/extensions/internal/moz.build
@@ -28,9 +28,3 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
 EXTRA_PP_JS_MODULES.addons += [
     'AddonConstants.jsm',
 ]
-
-if CONFIG['MOZ_ADDON_SIGNING']:
-    DEFINES['MOZ_ADDON_SIGNING'] = 1
-
-if CONFIG['MOZ_REQUIRE_SIGNING']:
-    DEFINES['MOZ_REQUIRE_SIGNING'] = 1