Bug 1340157: Re-enable compression for omni.ja files r=ted
authorChris AtLee <catlee@mozilla.com>
Wed, 15 Feb 2017 19:30:56 -0500
changeset 343309 29f4d23a9e97c324b40c63c71eff04add5fd2a09
parent 343308 e76a72dceeea8f79d64f4c43600cbc180ddeb478
child 343310 00fd29fee54edb5ef2038c344af9ce0dd792d25f
push id31376
push userkwierso@gmail.com
push dateFri, 17 Feb 2017 01:09:40 +0000
treeherdermozilla-central@6cefe01ca774 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1340157
milestone54.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 1340157: Re-enable compression for omni.ja files r=ted MozReview-Commit-ID: 7e8j4k61lAx
toolkit/mozapps/installer/upload-files.mk
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -356,21 +356,16 @@ ifndef MOZ_PKG_MANIFEST
 endif # MOZ_PKG_MANIFEST
 
 ifndef MOZ_PACKAGER_FORMAT
   MOZ_PACKAGER_FORMAT = $(error MOZ_PACKAGER_FORMAT is not set)
 endif
 
 ifneq (android,$(MOZ_WIDGET_TOOLKIT))
   OPTIMIZEJARS = 1
-  ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
-    ifdef NIGHTLY_BUILD
-      DISABLE_JAR_COMPRESSION = 1
-    endif
-  endif
 endif
 
 # A js binary is needed to perform verification of JavaScript minification.
 # We can only use the built binary when not cross-compiling. Environments
 # (such as release automation) can provide their own js binary to enable
 # verification when cross-compiling.
 ifndef JS_BINARY
   ifndef CROSS_COMPILE