Backed out changeset 292d13beeb7b (bug 1186522) for Gaia unit test bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 28 Aug 2015 21:43:37 -0400
changeset 292557 f93f561fb199375cba17c6878f89dcbdb4812ad4
parent 292556 05c0212b9f16b64366d08a981f1d78e2cbb68717
child 292558 9c38b505ef575964852975ac192213550a694498
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1186522
milestone43.0a1
backs out292d13beeb7b984dfa4effe685f2681dc1b2e941
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 292d13beeb7b (bug 1186522) for Gaia unit test bustage.
browser/config/mozconfigs/linux64/nightly-no-add-on-sign
browser/confvars.sh
build/mozconfig.common
configure.in
mobile/android/confvars.sh
toolkit/mozapps/extensions/internal/XPIProvider.jsm
toolkit/mozapps/extensions/internal/moz.build
deleted file mode 100644
--- a/browser/config/mozconfigs/linux64/nightly-no-add-on-sign
+++ /dev/null
@@ -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
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -58,8 +58,11 @@ MOZ_WEBAPP_RUNTIME=1
 MOZ_MEDIA_NAVIGATOR=1
 MOZ_WEBGL_CONFORMANT=1
 # Enable navigator.mozPay
 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
--- a/build/mozconfig.common
+++ b/build/mozconfig.common
@@ -11,14 +11,9 @@
 # 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_ADDON_SIGNING=${MOZ_REQUIRE_ADDON_SIGNING-0}
-
 . "$topsrcdir/build/mozconfig.automation"
--- a/configure.in
+++ b/configure.in
@@ -3786,16 +3786,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=
 
 case "$target_os" in
     mingw*)
         NS_ENABLE_TSF=1
         AC_DEFINE(NS_ENABLE_TSF)
         ;;
 esac
 
@@ -8602,22 +8604,18 @@ AC_SUBST(MOZ_FIX_LINK_PATHS)
 AC_SUBST(USE_DEPENDENT_LIBS)
 
 AC_SUBST(MOZ_BUILD_ROOT)
 
 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)
 fi
 
 AC_SUBST(MOZ_JSDOWNLOADS)
 if test -n "$MOZ_JSDOWNLOADS"; then
   AC_DEFINE(MOZ_JSDOWNLOADS)
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -103,14 +103,17 @@ MOZ_ANDROID_DOWNLOADS_INTEGRATION=1
 MOZ_ANDROID_TAB_QUEUE=1
 
 # Use the low-memory GC tuning.
 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.
 if test "$NIGHTLY_BUILD"; then
   MOZ_SWITCHBOARD=1
 fi
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -8055,17 +8055,17 @@ Object.defineProperty(this, "ADDON_SIGNI
   value: false,
 #endif
 });
 
 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,
 #endif
 });
 
 let addonTypes = [
   new AddonManagerPrivate.AddonType("extension", URI_EXTENSION_STRINGS,
--- a/toolkit/mozapps/extensions/internal/moz.build
+++ b/toolkit/mozapps/extensions/internal/moz.build
@@ -29,8 +29,14 @@ EXTRA_PP_JS_MODULES.addons += [
 
 # This is used in multiple places, so is defined here to avoid it getting
 # out of sync.
 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