From 0ece720e9f07868d7cba75fd479d726ae282be35 Mon Sep 17 00:00:00 2001
From: Gaming4JC <g4jc@hyperbola.info>
Date: Mon, 7 Dec 2020 19:12:56 -0500
Subject: Backport UXP - [AM] Clean up addon-signing build leftovers.

---
 components/nsBrowserGlue.js | 7 +------
 confvars.sh                 | 3 ---
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/components/nsBrowserGlue.js b/components/nsBrowserGlue.js
index bc85f14..8d66c47 100644
--- a/components/nsBrowserGlue.js
+++ b/components/nsBrowserGlue.js
@@ -901,12 +901,7 @@ BrowserGlue.prototype = {
       });
     }
 
-    let signingRequired;
-    if (AppConstants.MOZ_REQUIRE_SIGNING) {
-      signingRequired = true;
-    } else {
-      signingRequired = Services.prefs.getBoolPref("xpinstall.signatures.required");
-    }
+    let signingRequired = Services.prefs.getBoolPref("xpinstall.signatures.required");
 
     if (signingRequired) {
       let disabledAddons = AddonManager.getStartupChanges(AddonManager.STARTUP_CHANGE_DISABLED);
diff --git a/confvars.sh b/confvars.sh
index d3a38a8..360dc54 100755
--- a/confvars.sh
+++ b/confvars.sh
@@ -57,6 +57,3 @@ if test "$OS_ARCH" = "WINNT" -o \
   MOZ_CAN_DRAW_IN_TITLEBAR=1
 fi
 
-# Disable checking that add-ons are signed by the trusted root
-MOZ_ADDON_SIGNING=
-MOZ_REQUIRE_SIGNING=
-- 
cgit v1.2.3