From 53d03bac826d8bf27f04310cdfb5e01f668f2674 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Fri, 11 May 2018 13:51:38 -0700
Subject: [PATCH] Bug 1460716 - Make mobile/android artifact builds produce
 features JSON. r=gps

I don't understand how this will interact with the parts of the build
where we try to avoid installing the dist/bin manifest, but this makes
sense to me and it works locally for mobile/android and for browser/.

MozReview-Commit-ID: L7RtA4K3WrX

--HG--
extra : rebase_source : 3c08a5aab5398eb3b5685b18e5fe06e926db5f85
---
 config/faster/rules.mk | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/config/faster/rules.mk b/config/faster/rules.mk
index 7480a5f0a218..e22a8ef3741d 100644
--- a/config/faster/rules.mk
+++ b/config/faster/rules.mk
@@ -109,9 +109,20 @@ $(TOPOBJDIR)/build/application.ini: $(TOPOBJDIR)/buildid.h $(TOPOBJDIR)/source-r
 
 # The manifest of allowed system add-ons should be re-built when using
 # "build faster".
-ifeq ($(MOZ_BUILD_APP),browser/app)
+#
+# Note the dependency on install-dist/bin.  The form of this
+# dependency is critical: it's triggering the stem rule (install-%)
+# above to force the dist/bin manifest to be processed.  The more
+# obvious `$(TOPOBJDIR)/install-dist_bin` doesn't work because
+# dist/bin isn't in $(INSTALL_MANIFESTS) in the
+# FasterMake+RecursiveMake (artifact build) situation.
+ifeq ($(MOZ_BUILD_APP),browser)
+$(TOPOBJDIR)/browser/app/features: install-dist/bin
+
 default: $(TOPOBJDIR)/browser/app/features
 endif
 ifeq ($(MOZ_BUILD_APP),mobile/android)
+$(TOPOBJDIR)/mobile/android/base/features: install-dist/bin
+
 default: $(TOPOBJDIR)/mobile/android/base/features
 endif