Bug 1348981 - provide a list of valid system add-ons for packaging r=glandium

MozReview-Commit-ID: K2jCHBBJBqw

--HG--
extra : rebase_source : 0a1414d3e778d36f053800212e7d633eaa91de6b

browser/app/Makefile.in

@@ -83,7 +83,7 @@ clean clobber repackage::
 MAC_BUNDLE_VERSION = $(shell $(PYTHON) $(srcdir)/macversion.py --version=$(MOZ_APP_VERSION) --buildid=$(DEPTH)/buildid.h)
 
 .PHONY: repackage
-tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME)
+tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME) features
 	rm -rf $(dist_dest)
 	$(MKDIR) -p $(dist_dest)/Contents/MacOS
 	$(MKDIR) -p $(dist_dest)/$(LPROJ)
@@ -104,3 +104,7 @@ ifdef MOZ_UPDATER
 endif
 	printf APPLMOZB > $(dist_dest)/Contents/PkgInfo
 endif
+
+.PHONY: features
+tools features::
+	$(PYTHON) -c 'import os, json; listing = {"system": os.listdir("$(DIST)/bin/browser/features")}; print json.dumps(listing)' > $(DIST)/bin/browser/chrome/browser/content/browser/built_in_addons.json

config/faster/rules.mk

@@ -110,3 +110,9 @@ endif
 $(TOPOBJDIR)/config/makefiles/xpidl/xpidl: $(addprefix install-,$(filter dist/bin%,$(INSTALL_MANIFESTS)))
 
 $(TOPOBJDIR)/build/application.ini: $(TOPOBJDIR)/buildid.h $(TOPOBJDIR)/source-repo.h
+
+# The manifest of allowed system add-ons should be re-built when using
+# "build faster".
+ifeq ($(MOZ_BUILD_APP),browser/app)
+default: $(TOPOBJDIR)/browser/app/features
+endif