[tbb-commits] [tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 21431: Clean-up system extensions shipped in Firefox 52

[gk at torproject.org]

commit 6b8a66553b3aa4a518dc4448baf11099a8df22cd
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Tue May 23 17:05:29 2017 -0400

    Bug 21431: Clean-up system extensions shipped in Firefox 52
    
    Only ship the e10srollout system extension and pdfjs.
---
 browser/extensions/moz.build | 10 ----------
 browser/locales/Makefile.in  |  1 -
 2 files changed, 11 deletions(-)

diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
index 9b01ed0..71fda56 100644
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -5,16 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
-    'aushelper',
     'e10srollout',
     'pdfjs',
-    'pocket',
-    'webcompat',
 ]
-
-# Only include the following system add-ons if building Aurora or Nightly
-if 'a' in CONFIG['GRE_MILESTONE']:
-    DIRS += [
-        'flyweb',
-        'formautofill',
-    ]
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index 6b0455b..e178dfe 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -99,7 +99,6 @@ libs-%:
 	@$(MAKE) -C ../../toolkit/locales libs-$* 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-$*
-	@$(MAKE) -C ../extensions/pocket/locale AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
 	@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*