Bug 1235108 - Install bookmarks.html from jar.mn instead of a custom Makefile rule. r=gps

browser/locales/Makefile.in

@@ -101,14 +101,7 @@ PROFILE_FILES = \
 
 PROFILE_CHROME = userChrome-example.css userContent-example.css
 
-%/chrome/$(AB_CD)/locale/browser/bookmarks.html: $(call MERGE_FILE,profile/bookmarks.inc) generic/profile/bookmarks.html.in $(GLOBAL_DEPS)
-	$(call py_action,preprocessor, \
-	  -DBOOKMARKS_INCLUDE_DIR=$(<D) \
-	  -DAB_CD=$(AB_CD) \
-	  $(srcdir)/generic/profile/bookmarks.html.in \
-	  -o $@)
-
-libs:: $(FINAL_TARGET)/chrome/$(AB_CD)/locale/browser/bookmarks.html ;
+DEFINES += -DBOOKMARKS_INCLUDE_DIR=$(dir $(call MERGE_FILE,profile/bookmarks.inc))
 
 libs:: $(addprefix generic/profile/,$(PROFILE_FILES))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile

browser/locales/jar.mn

@@ -6,6 +6,7 @@
 
 @AB_CD@.jar:
 % locale browser @AB_CD@ %locale/browser/
+*   locale/browser/bookmarks.html                  (generic/profile/bookmarks.html.in)
     locale/browser/aboutAccounts.dtd               (%chrome/browser/aboutAccounts.dtd)
     locale/browser/aboutCertError.dtd              (%chrome/browser/aboutCertError.dtd)
     locale/browser/aboutDialog.dtd                 (%chrome/browser/aboutDialog.dtd)

config/faster/rules.mk

@@ -101,10 +101,12 @@ $(addprefix install-,$(INSTALL_MANIFESTS)): install-%: $(TOPOBJDIR)/config/build
 	@# The overhead is not that big, and this avoids waiting for proper
 	@# support for defines tracking in process_install_manifest.
 	@touch install_$(subst /,_,$*)
+	@# BOOKMARKS_INCLUDE_DIR is for bookmarks.html only.
 	$(PYTHON) -m mozbuild.action.process_install_manifest \
 		--track install_$(subst /,_,$*).track \
 		$(TOPOBJDIR)/$* \
 		-DAB_CD=en-US \
+		-DBOOKMARKS_INCLUDE_DIR=$(TOPSRCDIR)/browser/locales/en-US/profile \
 		-DMOZ_APP_BUILDID=$(shell cat $(TOPOBJDIR)/config/buildid) \
 		$(ACDEFINES) \
 		install_$(subst /,_,$*)