Bug 1373395 - Upload chrome-map.json during code coverage builds. r=mshal

MozReview-Commit-ID: 37UxsMQoB7q

--HG--
extra : rebase_source : ee9e07f3e3809e8af1cd524a8e425e466b2039b6

toolkit/mozapps/installer/packager.mk

@@ -68,6 +68,9 @@ ifdef MOZ_ARTIFACT_BUILD_SYMBOLS
           zip -r5D '../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip' . -i '*.sym' -i '*.txt'
 endif # MOZ_ARTIFACT_BUILD_SYMBOLS
 ifdef MOZ_CODE_COVERAGE
+	@echo 'Generating chrome-map for coverage data...'
+	$(topsrcdir)/mach build-backend -b ChromeMap
+	@echo 'Packaging code coverage data...'
 	# Package code coverage gcno tree
 	@echo 'Packaging code coverage data...'
 	$(RM) $(CODE_COVERAGE_ARCHIVE_BASENAME).zip

toolkit/mozapps/installer/upload-files.mk

@@ -419,7 +419,9 @@ endif
 
 ifdef MOZ_CODE_COVERAGE
   UPLOAD_FILES += \
-    $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(CODE_COVERAGE_ARCHIVE_BASENAME).zip)
+    $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(CODE_COVERAGE_ARCHIVE_BASENAME).zip) \
+    $(call QUOTED_WILDCARD,$(topobjdir)/chrome-map.json) \
+    $(NULL)
 endif
 
 ifdef MOZ_STYLO