From 55fb66e7712a211d66d25526800d122cbc205f0d Mon Sep 17 00:00:00 2001
From: Kim Moir <kmoir@mozilla.com>
Date: Mon, 11 Apr 2016 12:16:51 -0400
Subject: [PATCH] revert Bug 1186522 - force per checkin and release desktop
 firefox builds to require signed add-ons on beta 45 r=mshal

---
 build/mozconfig.common                        |  5 -----
 mobile/android/confvars.sh                    |  3 +++
 old-configure.in                              | 12 +++++-------
 toolkit/modules/moz.build                     |  1 +
 toolkit/mozapps/extensions/internal/moz.build |  6 ++++++
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/build/mozconfig.common b/build/mozconfig.common
index 6e19ae80ecac..1bdf69ddc5c3 100644
--- a/build/mozconfig.common
+++ b/build/mozconfig.common
@@ -16,11 +16,6 @@ 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
index 64addad00a35..c23dd8f38943 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -99,6 +99,9 @@ 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.
diff --git a/old-configure.in b/old-configure.in
index 746a0eb1ef16..3a240672490a 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2804,6 +2804,8 @@ 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
@@ -7042,17 +7044,13 @@ 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)
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index f58876d028af..68c390cec143 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -124,6 +124,7 @@ for var in ('ANDROID_PACKAGE_NAME',
             DEFINES[var] = CONFIG[var]
 
 for var in ('MOZ_TOOLKIT_SEARCH',
+            'MOZ_REQUIRE_SIGNING',
             'MOZ_SYSTEM_NSS',
             'MOZ_UPDATER'):
     if CONFIG[var]:
diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/extensions/internal/moz.build
index 9574e54b30d1..ec586b968d7a 100644
--- a/toolkit/mozapps/extensions/internal/moz.build
+++ b/toolkit/mozapps/extensions/internal/moz.build
@@ -28,3 +28,9 @@ 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