Bug 1093718 - Turn off minification of Fennec JS in Nightly. r=mfinkle
authorNick Alexander <nalexander@mozilla.com>
Tue, 04 Nov 2014 10:11:00 +0100
changeset 214414 0fa23eddfe123000fee67dc5c557342a4c4df62f
parent 214413 5634e9cd480798de6145292ca3d71385f234a8cc
child 214415 347c76e80e6fd7eff7a19e1796ead4d645cecfc9
push id27781
push userkwierso@gmail.com
push dateFri, 07 Nov 2014 02:47:58 +0000
treeherdermozilla-central@f54c94033c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs1093718
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1093718 - Turn off minification of Fennec JS in Nightly. r=mfinkle In b2g/installer/Makefile.in, minification is conditional on not being a debug build. Seems reasonable to have minified and non-minified builds regardless of release channel, so I've copied that here.
mobile/android/installer/Makefile.in
--- a/mobile/android/installer/Makefile.in
+++ b/mobile/android/installer/Makefile.in
@@ -34,18 +34,22 @@ endif
 MOZ_PACKAGER_MINIFY=1
 
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
 
 # Note that JS_BINARY can be defined in packager.mk, so this test must come
 # after including that file. MOZ_PACKAGER_MINIFY_JS is used in packager.mk, but
 # since recipe evaluation is deferred, we can set it here after the inclusion.
 ifneq (,$(JS_BINARY))
+ifndef MOZ_DEBUG
+ifndef NIGHTLY_BUILD
 MOZ_PACKAGER_MINIFY_JS=1
 endif
+endif
+endif
 
 ifeq (bundle, $(MOZ_FS_LAYOUT))
 BINPATH = $(_BINPATH)
 DEFINES += -DAPPNAME=$(_APPNAME)
 else
 # Every other platform just winds up in dist/bin
 BINPATH = bin
 endif