Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-05-09 07:01:19 +08:00
commit bd1e07b203
33 changed files with 163 additions and 449 deletions

View file

@ -1044,12 +1044,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);

View file

@ -64,7 +64,3 @@ if test "$OS_ARCH" = "WINNT" -o \
"$OS_ARCH" = "Darwin"; then
MOZ_CAN_DRAW_IN_TITLEBAR=1
fi
# Disable checking that add-ons are signed by the trusted root
MOZ_ADDON_SIGNING=0
MOZ_REQUIRE_SIGNING=0