From d1017437b34fe4f6a792a6621df56ea726ceca21 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 19 May 2016 10:35:39 -0400
Subject: [PATCH] Backed out changeset f8e784f16f69 (bug 1273006) for breaking
 Android nightlies. a=me

---
 Makefile.in             | 2 --
 build/moz-automation.mk | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index eedd84b1a641..8b7bc45fe0f6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -286,12 +286,10 @@ MAKE_SYM_STORE_ARGS += --install-manifest=$(DEPTH)/_build_manifests/install/dist
 
 SYM_STORE_SOURCE_DIRS := $(topsrcdir)
 
-ifdef MOZ_CRASHREPORTER
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 SYMBOL_INDEX_NAME = \
   $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)-$(CPU_ARCH)-symbols.txt
-endif
 
 buildsymbols:
 ifdef MOZ_CRASHREPORTER
diff --git a/build/moz-automation.mk b/build/moz-automation.mk
index 5dfeb2a7a021..ec63233a1345 100644
--- a/build/moz-automation.mk
+++ b/build/moz-automation.mk
@@ -11,6 +11,12 @@ else
 endif
 endif
 
+include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
+include $(topsrcdir)/toolkit/mozapps/installer/upload-files.mk
+
+# Clear out DIST_FILES if it was set by upload-files.mk (for Android builds)
+DIST_FILES =
+
 # Helper variables to convert from MOZ_AUTOMATION_* variables to the
 # corresponding the make target
 tier_MOZ_AUTOMATION_BUILD_SYMBOLS = buildsymbols