Bug 641212 - use lzma compression for application update. Part 1 - xz-embedded build config changes. r=glandium, a=app_update_lzma
authorRobert Strong <robert.bugzilla@gmail.com>
Sun, 30 Jul 2017 23:26:56 -0700
changeset 420620 89a4dd1ba384127da48a2804f59f6edf61835645
parent 420619 6d1b50a370b4adffbb1ee73b9f51707c90d6a2b1
child 420621 692137868c6b6f3ea237c8e4cd1dc246d5f29088
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, app_update_lzma
bugs641212
milestone56.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 641212 - use lzma compression for application update. Part 1 - xz-embedded build config changes. r=glandium, a=app_update_lzma
config/external/moz.build
modules/xz-embedded/moz.build
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -16,16 +16,18 @@ if not CONFIG['MOZ_SYSTEM_JPEG']:
 if CONFIG['MOZ_UPDATER']:
     if not CONFIG['MOZ_SYSTEM_BZ2']:
         external_dirs += ['modules/libbz2']
 
 # There's no "native" brotli or woff2 yet, but probably in the future...
 external_dirs += ['modules/brotli']
 external_dirs += ['modules/woff2']
 
+external_dirs += ['modules/xz-embedded']
+
 if CONFIG['MOZ_VORBIS']:
     external_dirs += ['media/libvorbis']
 
 if CONFIG['MOZ_TREMOR']:
     external_dirs += ['media/libtremor']
 
 if CONFIG['MOZ_WEBM_ENCODER']:
     external_dirs += ['media/libmkv']
@@ -59,12 +61,9 @@ external_dirs += [
     'media/libopus',
     'media/libtheora',
     'media/libspeex_resampler',
     'media/libstagefright',
     'media/libsoundtouch',
     'media/psshparser'
 ]
 
-if CONFIG['MOZ_LINKER']:
-    external_dirs += ['modules/xz-embedded']
-
 DIRS += ['../../' + i for i in external_dirs]
--- a/modules/xz-embedded/moz.build
+++ b/modules/xz-embedded/moz.build
@@ -28,9 +28,12 @@ if CONFIG['TARGET_CPU'].startswith('arm'
     else:
         DEFINES['XZ_DEC_ARM'] = 1
 elif '86' in CONFIG['TARGET_CPU']:
     # Accept x86, x86_64, i386, i686, etc.
     DEFINES['XZ_DEC_X86'] = 1
 
 DEFINES['XZ_USE_CRC64'] = 1
 
+if CONFIG['OS_ARCH'] == 'WINNT':
+    USE_STATIC_LIBS = True
+
 Library('xz-embedded')