Bug 1382182 - Build sdp using moz.build; r?ted,jesup
MozReview-Commit-ID: fZRprTixrc
--- a/media/webrtc/signaling/moz.build
+++ b/media/webrtc/signaling/moz.build
@@ -1,8 +1,9 @@
# -*- 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/.
DIRS += [
'src/jsep',
+ 'src/sdp',
]
--- a/media/webrtc/signaling/signaling.gyp
+++ b/media/webrtc/signaling/signaling.gyp
@@ -66,17 +66,16 @@
'./src',
'./src/common',
'./src/common/browser_logging',
'./src/common/time_profiling',
'./src/media',
'./src/media-conduit',
'./src/mediapipeline',
'./src/peerconnection',
- './src/sdp/sipcc',
'../../../dom/base',
'../../../dom/media',
'../../../dom/media/platforms',
'../../../media/mtransport',
'../trunk',
'../../libyuv/libyuv/include',
'../../mtransport/third_party/nrappkit/src/util/libekr',
],
@@ -128,51 +127,16 @@
'./src/peerconnection/PeerConnectionMedia.h',
# Media pipeline
'./src/mediapipeline/MediaPipeline.h',
'./src/mediapipeline/MediaPipeline.cpp',
'./src/mediapipeline/MediaPipelineFilter.h',
'./src/mediapipeline/MediaPipelineFilter.cpp',
'./src/mediapipeline/RtpLogger.h',
'./src/mediapipeline/RtpLogger.cpp',
- # SDP
- './src/sdp/sipcc/ccsdp.h',
- './src/sdp/sipcc/cpr_string.c',
- './src/sdp/sipcc/sdp_access.c',
- './src/sdp/sipcc/sdp_attr.c',
- './src/sdp/sipcc/sdp_attr_access.c',
- './src/sdp/sipcc/sdp_base64.c',
- './src/sdp/sipcc/sdp_config.c',
- './src/sdp/sipcc/sdp_main.c',
- './src/sdp/sipcc/sdp_token.c',
- './src/sdp/sipcc/sdp.h',
- './src/sdp/sipcc/sdp_base64.h',
- './src/sdp/sipcc/sdp_os_defs.h',
- './src/sdp/sipcc/sdp_private.h',
- './src/sdp/sipcc/sdp_utils.c',
- './src/sdp/sipcc/sdp_services_unix.c',
-
- # SDP Wrapper
- './src/sdp/Sdp.h',
- './src/sdp/SdpAttribute.h',
- './src/sdp/SdpAttribute.cpp',
- './src/sdp/SdpAttributeList.h',
- './src/sdp/SdpErrorHolder.h',
- './src/sdp/SdpHelper.h',
- './src/sdp/SdpHelper.cpp',
- './src/sdp/SdpMediaSection.h',
- './src/sdp/SdpMediaSection.cpp',
- './src/sdp/SipccSdp.h',
- './src/sdp/SipccSdpAttributeList.h',
- './src/sdp/SipccSdpAttributeList.cpp',
- './src/sdp/SipccSdpMediaSection.h',
- './src/sdp/SipccSdpParser.h',
- './src/sdp/SipccSdp.cpp',
- './src/sdp/SipccSdpMediaSection.cpp',
- './src/sdp/SipccSdpParser.cpp',
],
#
# DEFINES
#
'defines' : [
'LOG4CXX_STATIC',
new file mode 100644
--- /dev/null
+++ b/media/webrtc/signaling/src/sdp/moz.build
@@ -0,0 +1,29 @@
+# -*- 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/.
+DIRS += [
+ 'sipcc',
+]
+
+LOCAL_INCLUDES += [
+ '/media/mtransport',
+ '/media/webrtc',
+ '/media/webrtc/trunk',
+]
+
+UNIFIED_SOURCES += [
+ 'SdpAttribute.cpp',
+ 'SdpHelper.cpp',
+ 'SdpMediaSection.cpp',
+ 'SipccSdp.cpp',
+ 'SipccSdpAttributeList.cpp',
+ 'SipccSdpMediaSection.cpp',
+ 'SipccSdpParser.cpp',
+]
+
+FINAL_LIBRARY = 'xul'
+
+if CONFIG['GNU_CXX']:
+ CXXFLAGS += ['-Wno-shadow']
new file mode 100644
--- /dev/null
+++ b/media/webrtc/signaling/src/sdp/sipcc/moz.build
@@ -0,0 +1,42 @@
+# -*- 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/.
+LOCAL_INCLUDES += [
+ '/media/webrtc/signaling/src/common/browser_logging',
+]
+
+if CONFIG['OS_TARGET'] == 'WINNT':
+ DEFINES['SIP_OS_WINDOWS'] = True
+ SOURCES += [
+ 'sdp_services_win32.c',
+ ]
+elif CONFIG['OS_TARGET'] == 'Darwin':
+ DEFINES['SIP_OS_OSX'] = True
+ SOURCES += [
+ 'sdp_services_unix.c',
+ ]
+else:
+ DEFINES['SIP_OS_LINUX'] = True
+ SOURCES += [
+ 'sdp_services_unix.c',
+ ]
+
+# Multiple definitions of "logTag" mean we can't use unified build here.
+SOURCES += [
+ 'cpr_string.c',
+ 'sdp_access.c',
+ 'sdp_attr.c',
+ 'sdp_attr_access.c',
+ 'sdp_base64.c',
+ 'sdp_config.c',
+ 'sdp_main.c',
+ 'sdp_token.c',
+ 'sdp_utils.c',
+]
+
+FINAL_LIBRARY = 'xul'
+
+if CONFIG['GNU_CXX']:
+ CXXFLAGS += ['-Wno-shadow']
--- a/media/webrtc/signaling/src/sdp/sipcc/sdp_services_win32.c
+++ b/media/webrtc/signaling/src/sdp/sipcc/sdp_services_win32.c
@@ -1,16 +1,17 @@
/* 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 "sdp_os_defs.h"
#include "sdp.h"
#include "sdp_private.h"
+#include "CSFLog.h"
/******************************************************************/
/* Required Platform Routines */
/* */
/* These routines are called from the common SDP code. */
/* They must be provided for each platform. */
/* */
/******************************************************************/