Bug 1192587 - Build media/libav in unified mode. r=qDot
authorChris Peterson <cpeterson@mozilla.com>
Thu, 06 Aug 2015 19:39:26 -0700
changeset 277088 062c4849e766cf3db6c5dc0eea8296dc7f7973b8
parent 277087 f8990c35f5f8c6898883148dfc49f431d68dc67f
child 277089 ed7bf9f0cc9246745ccfbbb6d86c77b984082500
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-esr52@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersqDot
bugs1192587
milestone43.0a1
Bug 1192587 - Build media/libav in unified mode. r=qDot
media/libav/moz.build
--- a/media/libav/moz.build
+++ b/media/libav/moz.build
@@ -12,46 +12,51 @@ EXPORTS.libavcodec += [
     'libavcodec/avfft.h',
     'libavcodec/fft.h'
 ]
 
 EXPORTS.libavutil += [
     'libavutil/mem.h'
 ]
 
+# These sources can't be unified because of macro name conflicts or needing to
+# compile asm files separately.
 SOURCES += [
     'libavcodec/avfft.c',
     'libavcodec/fft_fixed.c',
+    'libavcodec/x86/fft.asm',
+    'libavutil/dict.c',
+    'libavutil/opt.c',
+    'libavutil/x86/cpuid.asm',
+]
+
+UNIFIED_SOURCES += [
     'libavcodec/fft_float.c',
     'libavcodec/rdft.c',
-    'libavcodec/x86/fft.asm',
     'libavcodec/x86/fft_init.c',
     'libavutil/avstring.c',
     'libavutil/cpu.c',
-    'libavutil/dict.c',
     'libavutil/error.c',
     'libavutil/eval.c',
     'libavutil/file.c',
     'libavutil/file_open.c',
     'libavutil/intmath.c',
     'libavutil/log.c',
     'libavutil/log2_tab.c',
     'libavutil/mathematics.c',
     'libavutil/mem.c',
-    'libavutil/opt.c',
     'libavutil/parseutils.c',
     'libavutil/random_seed.c',
     'libavutil/rational.c',
     'libavutil/sha.c',
-    'libavutil/x86/cpuid.asm'
 ]
 
 # Dummy functions are required for windows NoOpt/PGO builds.
 if CONFIG['_MSC_VER']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'avfft_dummy_funcs.c'
     ]
 
 # OS X requires a special header to make sure symbols are exported publicly in
 # the lgpl shared library, since it does not yet use system headers. This is
 # also used on linux for the time being, to avoid having to patch libav code.
 #
 # TODO: Remove header and patch libav once OS X supports system headers