Bug 835150 - Remove fast-package make target and references to MOZ_FAST_PACKAGE. r=mshal

This commit is contained in:
Cykesiopka 2013-12-12 17:36:59 -05:00
parent fb15e657d0
commit 57737a4401
3 changed files with 3 additions and 9 deletions

View File

@ -18,7 +18,4 @@
# Modifying this file will now automatically clobber the buildbot machines \o/
#
Bug 934646 needs a clobber -- the icon resources previously copied
into $OBJDIR/mobile/android/base/res will conflict with those in
$BRANDING_DIRECTORY/res.
Bug 887836 - webidl changes require a Windows clobber.

View File

@ -175,7 +175,7 @@ CONFIGURES := $(TOPSRCDIR)/configure
CONFIGURES += $(TOPSRCDIR)/js/src/configure
# Make targets that are going to be passed to the real build system
OBJDIR_TARGETS = install export libs clean realclean distclean maybe_clobber_profiledbuild upload sdk installer package fast-package package-compare stage-package source-package l10n-check
OBJDIR_TARGETS = install export libs clean realclean distclean maybe_clobber_profiledbuild upload sdk installer package package-compare stage-package source-package l10n-check
#######################################################################
# Rules
@ -224,7 +224,7 @@ build_all: build
clobber clobber_all: clean
# helper target for mobile
build_and_deploy: build fast-package install
build_and_deploy: build package install
# Do everything from scratch
everything: clean build

View File

@ -10,9 +10,6 @@ installer:
package:
@$(MAKE) -C mobile/android/installer
fast-package:
@$(MAKE) package MOZ_FAST_PACKAGE=1
ifeq ($(OS_TARGET),Android)
ifneq ($(MOZ_ANDROID_INSTALL_TARGET),)
ANDROID_SERIAL = $(MOZ_ANDROID_INSTALL_TARGET)