Bug 1382182 - Build peerconnection using moz.build; r?ted,jesup
MozReview-Commit-ID: IvG9Pf0PRfw
--- a/media/webrtc/signaling/moz.build
+++ b/media/webrtc/signaling/moz.build
@@ -2,10 +2,11 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += [
'src/jsep',
'src/media-conduit',
'src/mediapipeline',
+ 'src/peerconnection',
'src/sdp',
]
--- a/media/webrtc/signaling/signaling.gyp
+++ b/media/webrtc/signaling/signaling.gyp
@@ -105,25 +105,16 @@
# Browser Logging
'./src/common/browser_logging/CSFLog.cpp',
'./src/common/browser_logging/CSFLog.h',
'./src/common/browser_logging/WebRtcLog.cpp',
'./src/common/browser_logging/WebRtcLog.h',
# Browser Logging
'./src/common/time_profiling/timecard.c',
'./src/common/time_profiling/timecard.h',
- # PeerConnection
- './src/peerconnection/MediaPipelineFactory.cpp',
- './src/peerconnection/MediaPipelineFactory.h',
- './src/peerconnection/PeerConnectionCtx.cpp',
- './src/peerconnection/PeerConnectionCtx.h',
- './src/peerconnection/PeerConnectionImpl.cpp',
- './src/peerconnection/PeerConnectionImpl.h',
- './src/peerconnection/PeerConnectionMedia.cpp',
- './src/peerconnection/PeerConnectionMedia.h',
],
#
# DEFINES
#
'defines' : [
'LOG4CXX_STATIC',
@@ -161,24 +152,16 @@
'./src/media-conduit/WebrtcMediaCodecVP8VideoCodec.h',
'./src/media-conduit/MediaCodecVideoCodec.cpp',
'./src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp',
],
'defines' : [
'MOZ_WEBRTC_MEDIACODEC',
],
}],
- ['(build_for_test==0) and (build_for_standalone==0)', {
- 'sources': [
- './src/peerconnection/MediaStreamList.cpp',
- './src/peerconnection/MediaStreamList.h',
- './src/peerconnection/WebrtcGlobalInformation.cpp',
- './src/peerconnection/WebrtcGlobalInformation.h',
- ],
- }],
['build_for_test!=0', {
'include_dirs': [
'./test'
],
'defines' : [
'NO_CHROMIUM_LOGGING',
'USE_FAKE_PCOBSERVER',
],
new file mode 100644
--- /dev/null
+++ b/media/webrtc/signaling/src/peerconnection/moz.build
@@ -0,0 +1,36 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+include('../../../webrtc.mozbuild')
+
+LOCAL_INCLUDES += [
+ '!/ipc/ipdl/_ipdlheaders',
+ '/dom/base',
+ '/dom/media',
+ '/ipc/chromium/src',
+ '/media/mtransport',
+ '/media/webrtc',
+ '/media/webrtc/signaling/src/common',
+ '/media/webrtc/signaling/src/common/browser_logging',
+ '/media/webrtc/signaling/src/common/time_profiling',
+ '/media/webrtc/signaling/src/media-conduit',
+ '/media/webrtc/signaling/src/mediapipeline',
+ '/media/webrtc/trunk',
+]
+
+# Multiple uses of logTag
+SOURCES += [
+ 'MediaPipelineFactory.cpp',
+ 'MediaStreamList.cpp',
+ 'PeerConnectionCtx.cpp',
+ 'PeerConnectionImpl.cpp',
+ 'PeerConnectionMedia.cpp',
+ 'WebrtcGlobalInformation.cpp',
+]
+
+FINAL_LIBRARY = 'xul'
+
+if CONFIG['GNU_CXX']:
+ CXXFLAGS += ['-Wno-shadow']