Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1460716 - Make mobile/android artifact builds produce features JSON. r=gps

Browse Source 
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
This commit is contained in:
Nick Alexander 2018-05-11 13:51:38 -07:00
parent 78362e8ee9
commit 53d03bac82
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/faster/rules.mk
View File

@ -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