Bug 950507 - Build content/media/fmp4 in unified mode; r=roc
☠☠ backed out by 68f54b5d51cd ☠ ☠
authorEhsan Akhgari <ehsan@mozilla.com>
Sun, 15 Dec 2013 19:00:54 -0500
changeset 160551 bce074481220fcdde0072a527fd1af2ae73385d7
parent 160550 caa78bef50e3e8fdcb4a8e8128fa4584f088000c
child 160552 7635b9512d86a3d4d3ecbcfd3bd5772264f8bf68
push id37628
push usereakhgari@mozilla.com
push dateMon, 16 Dec 2013 00:01:07 +0000
treeherdermozilla-inbound@7635b9512d86 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs950507
milestone29.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 950507 - Build content/media/fmp4 in unified mode; r=roc
content/media/fmp4/moz.build
--- a/content/media/fmp4/moz.build
+++ b/content/media/fmp4/moz.build
@@ -25,17 +25,17 @@ EXPORTS.mp4_demuxer += [
     'demuxer/fourccs.h',
     'demuxer/mp4_demuxer.h',
     'demuxer/Streams.h',
     'demuxer/track_run_iterator.h',
     'demuxer/video_decoder_config.h',
     'demuxer/video_util.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'BlankDecoderModule.cpp',
     'demuxer/aac.cc',
     'demuxer/audio_decoder_config.cc',
     'demuxer/avc.cc',
     'demuxer/bit_reader.cc',
     'demuxer/box_definitions.cc',
     'demuxer/box_reader.cc',
     'demuxer/cenc.cc',
@@ -53,17 +53,17 @@ SOURCES += [
 
 if CONFIG['MOZ_WMF']:
   EXPORTS += [
       'wmf/MFTDecoder.h',
       'wmf/WMFAudioDecoder.h',
       'wmf/WMFDecoderModule.h',
       'wmf/WMFVideoDecoder.h',
   ]
-  SOURCES += [
+  UNIFIED_SOURCES += [
       'wmf/MFTDecoder.cpp',
       'wmf/WMFAudioDecoder.cpp',
       'wmf/WMFDecoderModule.cpp',
       'wmf/WMFVideoDecoder.cpp',
   ]
 
 FINAL_LIBRARY = 'gklayout'