Bug 1528149 - Enable ffvpx on artifact builds. r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 19 Feb 2019 05:48:27 +0000
changeset 459834 e433748cd2a1
parent 459833 a42ee9783546
child 459835 9a1f91d90de1
push id35576
push userbtara@mozilla.com
push dateTue, 19 Feb 2019 09:46:27 +0000
treeherdermozilla-central@dd4aa59c6a12 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1528149
milestone67.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 1528149 - Enable ffvpx on artifact builds. r=froydnj Differential Revision: https://phabricator.services.mozilla.com/D19913
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -1520,17 +1520,18 @@ with only_when(compile_environment):
 
     set_config('MOZ_LIBAV_FFT', depends(when=libav_fft)(lambda: True))
     set_define('MOZ_LIBAV_FFT', depends(when=libav_fft)(lambda: True))
     set_config('LIBAV_FFT_ASFLAGS', libav_fft.flags)
 
 
 # FFmpeg's ffvpx configuration
 # ==============================================================
-with only_when(compile_environment):
+# Artifact builds need MOZ_FFVPX defined as if compilation happened.
+with only_when(compile_environment | artifact_builds):
     @depends_if(yasm_version)
     def yasm_has_avx2(yasm_version):
         return yasm_version >= '1.2'
 
 
     set_config('YASM_HAS_AVX2', yasm_has_avx2)
 
 
@@ -1556,17 +1557,18 @@ with only_when(compile_environment):
                 else:
                     # Default to unix.
                     flags.append('-Pconfig_unix64.asm')
             else:
                 flac_only = True
         elif target.cpu in ('arm', 'aarch64') and \
                 target.kernel not in ('WINNT', 'Darwin'):
             enable = flac_only = True
-            flags.extend(vpx_as_flags)
+            if vpx_as_flags:
+                flags.extend(vpx_as_flags)
 
         if use_yasm:
             # default disabled components
             flags.append('-Pdefaults_disabled.asm')
             if not yasm_has_avx2:
                 flags.extend((
                     '-DHAVE_AVX2=0',
                     '-DHAVE_AVX2_INTERNAL=0',