Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1563564 - Only package Normandy artifact when MOZ_NORMANDY is set. r=froydnj

Browse Source 
Thunderbird builds do not support Normandy. This patch fixes build bustage
when building Thunderbird on linux64 and win64 by requiring that MOZ_NORMANDY
is defined as is the case when --project=browser.

Differential Revision: https://phabricator.services.mozilla.com/D63591

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Rob Lemley 2020-02-21 02:37:33 +00:00
parent 356abf224c
commit 5c8273802c
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/mozapps/installer/packager.mk
View File

@ -124,11 +124,13 @@ ifdef MOZ_AUTOMATION
--no-download \
)
endif
ifdef MOZ_NORMANDY
ifndef CROSS_COMPILE
# Generate a file that describes the local Normandy client.
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(DIST)/$(PKG_PATH)/bin" \
$(DIST)/$(PKG_PATH)/bin/xpcshell \
$(MOZILLA_DIR)/toolkit/components/normandy/metadata-script.js $(MOZ_NORMANDY_JSON)
endif
endif
$(TOUCH) $@

2
toolkit/mozapps/installer/upload-files.mk
View File

@ -393,9 +393,11 @@ ifneq ($(filter-out en-US x-test,$(AB_CD)),)
$(call QUOTED_WILDCARD,$(topobjdir)/$(MOZ_BUILD_APP)/installer/windows/l10ngen/setup-stub.exe)
endif
ifdef MOZ_NORMANDY
ifndef CROSS_COMPILE
UPLOAD_FILES += $(call QUOTED_WILDCARD,$(MOZ_NORMANDY_JSON))
endif
endif
ifdef MOZ_CODE_COVERAGE
UPLOAD_FILES += \