Bug 939582 - Part 2: Build content/media in unified mode; r=doublec

This commit is contained in:
Ehsan Akhgari 2013-11-20 21:12:13 -05:00
parent 0dbeb42c94
commit 9f2fd74bea

View File

@ -104,7 +104,7 @@ EXPORTS.mozilla.dom += [
'VideoStreamTrack.h', 'VideoStreamTrack.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'AudioAvailableEventManager.cpp', 'AudioAvailableEventManager.cpp',
'AudioChannelFormat.cpp', 'AudioChannelFormat.cpp',
'AudioNodeEngine.cpp', 'AudioNodeEngine.cpp',
@ -114,7 +114,6 @@ SOURCES += [
'AudioStream.cpp', 'AudioStream.cpp',
'AudioStreamTrack.cpp', 'AudioStreamTrack.cpp',
'BufferDecoder.cpp', 'BufferDecoder.cpp',
'DecoderTraits.cpp',
'DOMMediaStream.cpp', 'DOMMediaStream.cpp',
'EncodedBufferCache.cpp', 'EncodedBufferCache.cpp',
'FileBlockCache.cpp', 'FileBlockCache.cpp',
@ -144,6 +143,11 @@ SOURCES += [
'WebVTTListener.cpp', 'WebVTTListener.cpp',
] ]
# DecoderTraits.cpp needs to be built separately because of Mac OS X headers.
SOURCES += [
'DecoderTraits.cpp',
]
FAIL_ON_WARNINGS = True FAIL_ON_WARNINGS = True
if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']: if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']: