summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-04-21 13:07:10 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-24 10:36:55 +0200
commitbf1fa93b9174c7acbc983c1f6bcb4048f5f2ee4a (patch)
tree20b9a10b4e2099287853c37919a7bed9210cfac1
parent0ac7481d2e47a4c8e95f81e46f987112207b07a3 (diff)
downloadUXP-bf1fa93b9174c7acbc983c1f6bcb4048f5f2ee4a.tar
UXP-bf1fa93b9174c7acbc983c1f6bcb4048f5f2ee4a.tar.gz
UXP-bf1fa93b9174c7acbc983c1f6bcb4048f5f2ee4a.tar.lz
UXP-bf1fa93b9174c7acbc983c1f6bcb4048f5f2ee4a.tar.xz
UXP-bf1fa93b9174c7acbc983c1f6bcb4048f5f2ee4a.zip
[AM] Clean up addon-signing build leftovers.
-rw-r--r--build/mozconfig.common5
-rw-r--r--old-configure.in9
-rwxr-xr-xpython/mozbuild/mozbuild/mozinfo.py2
-rw-r--r--toolkit/modules/AppConstants.jsm7
4 files changed, 0 insertions, 23 deletions
diff --git a/build/mozconfig.common b/build/mozconfig.common
index 3d2d0b289..1bdf69ddc 100644
--- a/build/mozconfig.common
+++ b/build/mozconfig.common
@@ -16,11 +16,6 @@ ac_add_options --enable-crashreporter
ac_add_options --enable-release
-# Disable checking that add-ons are signed by the trusted root
-MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-0}
-# 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/old-configure.in b/old-configure.in
index 45ac07aca..2965f60b7 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -4929,15 +4929,6 @@ AC_SUBST(MOZ_FIX_LINK_PATHS)
AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
AC_SUBST(MOZ_LINKER_EXTRACT)
-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/python/mozbuild/mozbuild/mozinfo.py b/python/mozbuild/mozbuild/mozinfo.py
index 230ca119a..3bdde249c 100755
--- a/python/mozbuild/mozbuild/mozinfo.py
+++ b/python/mozbuild/mozbuild/mozinfo.py
@@ -88,8 +88,6 @@ def build_dict(config, env=os.environ):
d['telemetry'] = substs.get('MOZ_TELEMETRY_REPORTING') == '1'
d['tests_enabled'] = substs.get('ENABLE_TESTS') == "1"
d['bin_suffix'] = substs.get('BIN_SUFFIX', '')
- d['addon_signing'] = substs.get('MOZ_ADDON_SIGNING') == '1'
- d['require_signing'] = substs.get('MOZ_REQUIRE_SIGNING') == '1'
d['official'] = bool(substs.get('MC_OFFICIAL'))
def guess_platform():
diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm
index 40aaadbf0..5eea04b0f 100644
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -194,13 +194,6 @@ MOZ_SAFE_BROWSING:
false,
#endif
- MOZ_REQUIRE_SIGNING:
-#ifdef MOZ_REQUIRE_SIGNING
- true,
-#else
- false,
-#endif
-
MENUBAR_CAN_AUTOHIDE:
#ifdef MENUBAR_CAN_AUTOHIDE
true,