From 5c8273802cd96aa7e9444f68729ab9254c94f684 Mon Sep 17 00:00:00 2001
From: Rob Lemley <rob@thunderbird.net>
Date: Fri, 21 Feb 2020 02:37:33 +0000
Subject: [PATCH] Bug 1563564 - Only package Normandy artifact when
 MOZ_NORMANDY is set. r=froydnj

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
---
 toolkit/mozapps/installer/packager.mk     | 2 ++
 toolkit/mozapps/installer/upload-files.mk | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index d4d6fe41d6d5..f04fc004aab9 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -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) $@
 
diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
index 166a76c23d5e..4b3c54ff2107 100644
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -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 += \