Commit a75ef66e authored by Kathleen Brade's avatar Kathleen Brade Committed by Georg Koppen
Browse files

Bug 21431: Clean-up system extensions shipped in Firefox 52 

Only ship the pdfjs extension.
parent 8fd2eb42

browser/app/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -109,4 +109,4 @@ endif 


.PHONY: features

tools features::

	$(PYTHON) -c 'import os, json; listing = {"system": sorted(os.listdir("$(DIST)/bin/browser/features"))}; print json.dumps(listing)' > $(DIST)/bin/browser/chrome/browser/content/browser/built_in_addons.json
 
	$(PYTHON) -c 'import os, json; listing = {"system": sorted(os.listdir("$(DIST)/bin/browser/features")) if os.path.exists("$(DIST)/bin/browser/features") else []}; print json.dumps(listing)' > $(DIST)/bin/browser/chrome/browser/content/browser/built_in_addons.json

browser/extensions/moz.build

+0 −32
Original line number Diff line number Diff line
@@ -5,37 +5,5 @@ 
# file, You can obtain one at http://mozilla.org/MPL/2.0/.



DIRS += [

    'activity-stream',

    'aushelper',

    'followonsearch',

    'formautofill',

    'onboarding',

    'pdfjs',

    'pocket',

    'screenshots',

    'webcompat',

]



# Only include the following system add-ons if building Aurora or Nightly

if not CONFIG['RELEASE_OR_BETA']:

    DIRS += [

        'presentation',

    ]



# Only include the following system add-ons if building DevEdition or Nightly

if CONFIG['MOZ_DEV_EDITION'] or CONFIG['NIGHTLY_BUILD']:

    DIRS += [

        'webcompat-reporter',

    ]



# Only include mortar system add-ons if we locally enable it

if CONFIG['MOZ_MORTAR']:

    DIRS += [

        'mortar',

    ]



# Add ASan reporter system add-on if requested

if CONFIG['MOZ_ASAN_REPORTER']:

    DIRS += [

        'asan-reporter',

]

browser/installer/package-manifest.in

+2 −1
Original line number Diff line number Diff line
@@ -605,7 +605,8 @@ 
@RESPATH@/browser/chrome/icons/default/default64.png

@RESPATH@/browser/chrome/icons/default/default128.png

#endif

@RESPATH@/browser/features/*

; In Tor Browser, the browser/features directory is missing (no system extensions).

;@RESPATH@/browser/features/*



; [Webide Files]

@RESPATH@/browser/chrome/webide@JAREXT@

browser/locales/Makefile.in

+0 −21
Original line number Diff line number Diff line
@@ -74,17 +74,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-$*

ifneq (,$(wildcard ../extensions/formautofill/locales))

	@$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$*

endif

	@$(MAKE) -C ../extensions/onboarding/locales AB_CD=$* XPI_NAME=locale-$*

	@$(MAKE) -C ../extensions/pocket/locale AB_CD=$* XPI_NAME=locale-$*

ifndef RELEASE_OR_BETA

	@$(MAKE) -C ../extensions/presentation/locale AB_CD=$* XPI_NAME=locale-$*

endif

ifneq '$(or $(MOZ_DEV_EDITION),$(NIGHTLY_BUILD))' ''

	@$(MAKE) -C ../extensions/webcompat-reporter/locales AB_CD=$* XPI_NAME=locale-$*

endif

	@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'

	@$(MAKE) -C ../../devtools/shim/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'

	@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
@@ -99,20 +88,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 ../extensions/pocket/locale chrome AB_CD=$*

ifndef RELEASE_OR_BETA

	@$(MAKE) -C ../extensions/presentation/locale chrome AB_CD=$*

endif

	@$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$*

	@$(MAKE) -C ../../devtools/shim/locales chrome AB_CD=$*

	@$(MAKE) chrome AB_CD=$*

	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*

ifdef NIGHTLY_BUILD

	@$(MAKE) -C ../extensions/webcompat-reporter/locales chrome AB_CD=$*

endif



package-win32-installer: $(SUBMAKEFILES)

	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer

browser/locales/jar.mn

+2 −2
Original line number Diff line number Diff line
@@ -113,6 +113,6 @@ 
#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

#[.] chrome.jar:

#% manifest features/chrome.manifest

#endif