diff options
Diffstat (limited to 'toolkit/mozapps/installer/upload-files.mk')
| -rw-r--r-- | toolkit/mozapps/installer/upload-files.mk | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk index 865d2cf6a6..1bbccecb2f 100644 --- a/toolkit/mozapps/installer/upload-files.mk +++ b/toolkit/mozapps/installer/upload-files.mk @@ -15,11 +15,7 @@ else ifeq (,$(filter-out gtk2 gtk3 qt, $(MOZ_WIDGET_TOOLKIT))) MOZ_PKG_FORMAT = BZ2 else - ifeq (android,$(MOZ_WIDGET_TOOLKIT)) - MOZ_PKG_FORMAT = APK - else - MOZ_PKG_FORMAT = TGZ - endif + MOZ_PKG_FORMAT = TGZ endif endif endif @@ -381,14 +377,8 @@ 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 - JAR_COMPRESSION ?= none - endif - endif -endif +# We optimize jars on all supported OS-es +OPTIMIZEJARS = 1 # A js binary is needed to perform verification of JavaScript minification. # We can only use the built binary when not cross-compiling. Environments |