commit 91463d31b02b542cbfd2f0e07faf0b12d733d821
Author: Kathy Brade <br...@pearlcrescent.com>
Date:   Tue May 23 17:05:29 2017 -0400

    Bug 21431: Clean-up system extensions shipped in Firefox
    
    Only ship the pdfjs extension.
---
 browser/components/BrowserGlue.jsm    | 6 ++++++
 browser/extensions/moz.build          | 2 +-
 browser/installer/package-manifest.in | 1 -
 browser/locales/Makefile.in           | 8 --------
 browser/locales/jar.mn                | 7 -------
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/browser/components/BrowserGlue.jsm 
b/browser/components/BrowserGlue.jsm
index 3725c8f8b7a5..869317142bb2 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -2201,6 +2201,9 @@ BrowserGlue.prototype = {
     const ID = "screensh...@mozilla.org";
     const _checkScreenshotsPref = async () => {
       let addon = await AddonManager.getAddonByID(ID);
+      if (!addon) {
+        return;
+      }
       let disabled = Services.prefs.getBoolPref(PREF, false);
       if (disabled) {
         await addon.disable({ allowSystemAddons: true });
@@ -2217,6 +2220,9 @@ BrowserGlue.prototype = {
     const ID = "webcompat-repor...@mozilla.org";
     Services.prefs.addObserver(PREF, async () => {
       let addon = await AddonManager.getAddonByID(ID);
+      if (!addon) {
+        return;
+      }
       let enabled = Services.prefs.getBoolPref(PREF, false);
       if (enabled && !addon.isActive) {
         await addon.enable({ allowSystemAddons: true });
diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
index df98fa94f629..8b16ddc4a84a 100644
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ["doh-rollout", "formautofill", "screenshots", "webcompat", 
"report-site-issue"]
+DIRS += []
 
 if not CONFIG["TOR_BROWSER_DISABLE_TOR_LAUNCHER"]:
     DIRS += ["tor-launcher"]
diff --git a/browser/installer/package-manifest.in 
b/browser/installer/package-manifest.in
index 74589084d4fa..937afa28fd71 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -272,7 +272,6 @@
 @RESPATH@/browser/chrome/icons/default/default64.png
 @RESPATH@/browser/chrome/icons/default/default128.png
 #endif
-@RESPATH@/browser/features/*
 
 ; [DevTools Startup Files]
 @RESPATH@/browser/chrome/devtools-startup@JAREXT@
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index 496379c4306f..0946188813da 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -58,10 +58,6 @@ l10n-%:
        @$(MAKE) -C ../../toolkit/locales l10n-$* 
XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
        @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
        @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* 
XPI_NAME=locale-$*
-ifneq (,$(wildcard ../extensions/formautofill/locales))
-       @$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* 
XPI_NAME=locale-$*
-endif
-       @$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* 
XPI_NAME=locale-$*
        @$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* 
XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
        @$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* 
XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
        @$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
@@ -75,14 +71,10 @@ chrome-%:
        @$(MAKE) -C ../../toolkit/locales chrome-$*
        @$(MAKE) -C ../../services/sync/locales chrome AB_CD=$*
        @$(MAKE) -C ../../extensions/spellcheck/locales chrome AB_CD=$*
-ifneq (,$(wildcard ../extensions/formautofill/locales))
-       @$(MAKE) -C ../extensions/formautofill/locales chrome AB_CD=$*
-endif
        @$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$*
        @$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
        @$(MAKE) chrome AB_CD=$*
        @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
-       @$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$*
 
 package-win32-installer: $(SUBMAKEFILES)
        $(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' 
installer
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index 454dcf5fdf2f..7866d448d176 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -54,10 +54,3 @@
     locale/browser/newInstall.dtd                  
(%chrome/browser/newInstall.dtd)
     locale/browser/brandings.dtd                   
(%chrome/browser/brandings.dtd)
     locale/browser/fxmonitor.properties            
(%chrome/browser/fxmonitor.properties)
-
-#ifdef XPI_NAME
-# Bug 1240628, restructure how l10n repacks work with feature addons
-# This is hacky, but ensures the chrome.manifest chain is complete
-[.] chrome.jar:
-% manifest features/chrome.manifest
-#endif



_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Reply via email to