Bug 1648651 - Fix building with --disable-compile-environment. r=firefox-build-system-reviewers,rstewart

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

build/moz-automation.mk

@@ -60,13 +60,18 @@ tier_MOZ_AUTOMATION_CHECK = check
 # dependencies between them).
 moz_automation_symbols = \
   MOZ_AUTOMATION_PACKAGE_TESTS \
+  MOZ_AUTOMATION_UPLOAD \
+  $(NULL)
+
+ifdef COMPILE_ENVIRONMENT
+moz_automation_symbols += \
   MOZ_AUTOMATION_BUILD_SYMBOLS \
   MOZ_AUTOMATION_UPLOAD_SYMBOLS \
   MOZ_AUTOMATION_PACKAGE \
   MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES \
-  MOZ_AUTOMATION_UPLOAD \
   MOZ_AUTOMATION_CHECK \
   $(NULL)
+endif
 MOZ_AUTOMATION_TIERS := $(foreach sym,$(moz_automation_symbols),$(if $(filter 1,$($(sym))),$(tier_$(sym))))
 
 # Dependencies between automation build steps

toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in

@@ -21,6 +21,7 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
+ifdef COMPILE_ENVIRONMENT
 tools::
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	# Copy for xpcshell tests
@@ -43,3 +44,4 @@ ifdef MOCHITESTBROWSERDIR
 	cp $(FINAL_TARGET)/updater-xpcshell$(BIN_SUFFIX) $(MOCHITESTBROWSERDIR)/updater$(BIN_SUFFIX)
 endif
 endif
+endif