Backed out changeset f8e784f16f69 (bug 1273006) for breaking Android nightlies. a=me

This commit is contained in:
Ryan VanderMeulen 2016-05-19 10:35:39 -04:00
Родитель df7777aa11
Коммит d1017437b3
2 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

@ -286,12 +286,10 @@ MAKE_SYM_STORE_ARGS += --install-manifest=$(DEPTH)/_build_manifests/install/dist
SYM_STORE_SOURCE_DIRS := $(topsrcdir) SYM_STORE_SOURCE_DIRS := $(topsrcdir)
ifdef MOZ_CRASHREPORTER
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
SYMBOL_INDEX_NAME = \ SYMBOL_INDEX_NAME = \
$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)-$(CPU_ARCH)-symbols.txt $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)-$(CPU_ARCH)-symbols.txt
endif
buildsymbols: buildsymbols:
ifdef MOZ_CRASHREPORTER ifdef MOZ_CRASHREPORTER

Просмотреть файл

@ -11,6 +11,12 @@ else
endif endif
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 # Helper variables to convert from MOZ_AUTOMATION_* variables to the
# corresponding the make target # corresponding the make target
tier_MOZ_AUTOMATION_BUILD_SYMBOLS = buildsymbols tier_MOZ_AUTOMATION_BUILD_SYMBOLS = buildsymbols