Bug 835150 - Remove fast-package make target and references to MOZ_FAST_PACKAGE. r=mshal
authorCykesiopka <cykesiopka.bmo@gmail.com>
Thu, 12 Dec 2013 17:36:59 -0500
changeset 170494 3df5b335e5a863db34f4f4cd34ab802d91351ca6
parent 170493 d9f6b387a49a931ef329cb8f68d5cc7a9de17a77
child 170495 cce5a57699a474bc9077ad1733d16fefa7406956
push id5166
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:47:54 +0000
treeherdermozilla-aurora@977eb2548b2d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs835150
milestone29.0a1
Bug 835150 - Remove fast-package make target and references to MOZ_FAST_PACKAGE. r=mshal
CLOBBER
client.mk
mobile/android/build.mk
--- a/CLOBBER
+++ b/CLOBBER
@@ -13,12 +13,9 @@
 #          |               |
 #          O <-- Clobber   O  <-- Clobber
 #
 # Note: The description below will be part of the error message shown to users.
 #
 # 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.
--- a/client.mk
+++ b/client.mk
@@ -170,17 +170,17 @@ MOZ_MAKE = $(MAKE) $(MOZ_MAKE_FLAGS) -C 
 
 endif # MOZ_BUILD_PROJECTS
 
 # 'configure' scripts generated by autoconf.
 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
 
 # The default rule is build
 build::
 	$(MAKE) -f $(TOPSRCDIR)/client.mk $(if $(MOZ_PGO),profiledbuild,realbuild)
 
@@ -219,17 +219,17 @@ ifneq (,$(strip $(MOZCONFIG_OUT_FILTERED
 	$(foreach line,$(MOZCONFIG_OUT_FILTERED),$(info $(NULL) $(NULL) $(NULL) $(NULL) $(subst ||, ,$(line))))
 endif
 
 # Windows equivalents
 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
 
 ####################################
 # Profile-Guided Optimization
 #  This is up here, outside of the MOZ_CURRENT_PROJECT logic so that this
 #  is usable in multi-pass builds, where you might not have a runnable
--- a/mobile/android/build.mk
+++ b/mobile/android/build.mk
@@ -5,19 +5,16 @@
 include  $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 installer:
 	@$(MAKE) -C mobile/android/installer 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)
 endif
 ifneq ($(ANDROID_SERIAL),)
 export ANDROID_SERIAL
 else
 # Determine if there's more than one device connected