commit 1c7d5ff5c2982f6ba67e2e7cf80398b147c7182e Author: Kathy Brade brade@pearlcrescent.com Date: Wed Aug 1 11:38:10 2018 -0400

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

Ship the onboarding system extension. --- browser/app/Makefile.in | 2 +- browser/extensions/moz.build | 1 + browser/installer/package-manifest.in | 3 +-- browser/locales/Makefile.in | 1 + browser/locales/jar.mn | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index d3ff94f2aa13..c2dc3ace199d 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -109,4 +109,4 @@ endif

.PHONY: features tools features:: - $(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 + $(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 diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build index 003619df13e3..a23ecc6bf5fa 100644 --- a/browser/extensions/moz.build +++ b/browser/extensions/moz.build @@ -5,5 +5,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/.

DIRS += [ + 'onboarding', 'pdfjs', ] diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index d71a76cf608a..7c89a4f70b95 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -605,8 +605,7 @@ @RESPATH@/browser/chrome/icons/default/default64.png @RESPATH@/browser/chrome/icons/default/default128.png #endif -; In Tor Browser, the browser/features directory is missing (no system extensions). -;@RESPATH@/browser/features/* +@RESPATH@/browser/features/*

; [Webide Files] @RESPATH@/browser/chrome/webide@JAREXT@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 5989e231b322..e67b2b08a795 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -74,6 +74,7 @@ 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/onboarding/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/shim/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$* diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index 560aa8f098b3..5472a9c946b0 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -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