revert Bug 1186522 - force per checkin and release desktop firefox builds to require signed add-ons on beta 45 r=mshal
☠☠ backed out by 4eb7a77cd764 ☠ ☠
authorKim Moir <kmoir@mozilla.com>
Mon, 11 Apr 2016 12:16:51 -0400
changeset 317791 d1ff10330267d97b6dd9556c685d35cbf013ce2e
parent 317790 7c4d19e3376f7f0d84c561413dddf069c5333a53
child 317792 0cfe55a2eb1f30fc98940fec0445af35986b1e52
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-esr52@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1186522
milestone48.0a1
revert Bug 1186522 - force per checkin and release desktop firefox builds to require signed add-ons on beta 45 r=mshal
build/mozconfig.common
mobile/android/confvars.sh
old-configure.in
toolkit/modules/moz.build
toolkit/mozapps/extensions/internal/moz.build
--- a/build/mozconfig.common
+++ b/build/mozconfig.common
@@ -11,16 +11,11 @@
 # of this file.
 
 mk_add_options AUTOCLOBBER=1
 
 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"
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -94,16 +94,19 @@ if test "$NIGHTLY_BUILD"; then
   MOZ_ANDROID_GCM=1
 fi
 
 # Enable C++ APZ on Nightly builds only.
 if test "$NIGHTLY_BUILD"; then
   MOZ_ANDROID_APZ=1
 fi
 
+# 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.
 MOZ_SWITCHBOARD=1
 
 # Enable DLC background service and stop shipping fonts in the APK
 MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE=1
 MOZ_ANDROID_EXCLUDE_FONTS=1
--- a/old-configure.in
+++ b/old-configure.in
@@ -2799,16 +2799,18 @@ ACCESSIBILITY=1
 MOZ_TIME_MANAGER=
 MOZ_SIMPLEPUSH=
 MOZ_PAY=
 MOZ_AUDIO_CHANNEL_MANAGER=
 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
     mingw*)
         NS_ENABLE_TSF=1
         AC_DEFINE(NS_ENABLE_TSF)
         ;;
 esac
@@ -7037,27 +7039,23 @@ AC_SUBST(USE_ELF_HACK)
 AC_SUBST(INCREMENTAL_LINKER)
 AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
 
 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
 
-if test "$MOZ_ADDON_SIGNING" = 1; then
-  AC_DEFINE(MOZ_ADDON_SIGNING)
-fi
-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)
 fi
 
 dnl ========================================================
 dnl = Mac bundle name prefix
 dnl ========================================================
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -119,14 +119,15 @@ for var in ('ANDROID_PACKAGE_NAME',
             'MOZ_MACBUNDLE_NAME',
             'MOZ_WIDGET_TOOLKIT',
             'DLL_PREFIX',
             'DLL_SUFFIX',
             'DEBUG_JS_MODULES'):
             DEFINES[var] = CONFIG[var]
 
 for var in ('MOZ_TOOLKIT_SEARCH',
+            'MOZ_REQUIRE_SIGNING',
             'MOZ_SYSTEM_NSS',
             'MOZ_UPDATER'):
     if CONFIG[var]:
         DEFINES[var] = True
 
 DEFINES['TOPOBJDIR'] = TOPOBJDIR
--- a/toolkit/mozapps/extensions/internal/moz.build
+++ b/toolkit/mozapps/extensions/internal/moz.build
@@ -23,8 +23,14 @@ EXTRA_JS_MODULES.addons += [
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     EXTRA_JS_MODULES.addons += [
         'PluginProvider.jsm',
     ]
 
 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