Bug 1382182 - Build peerconnection using moz.build; r=ted,jesup
authorDan Minor <dminor@mozilla.com>
Fri, 21 Jul 2017 16:28:29 -0400
changeset 669905 a3c417b417241e458bb1d787cf659aad22aa536b
parent 669904 ce7d7a06cf83c46cad925bbda67f549a3db500a8
child 669906 1f0a69b73cd1e944c511fcb8fbcadcc8cfca0e54
push id81465
push userbmo:dharvey@mozilla.com
push dateMon, 25 Sep 2017 15:46:49 +0000
reviewersted, jesup
bugs1382182
milestone58.0a1
Bug 1382182 - Build peerconnection using moz.build; r=ted,jesup MozReview-Commit-ID: IvG9Pf0PRfw
media/webrtc/moz.build
media/webrtc/signaling/signaling.gyp
media/webrtc/signaling/src/peerconnection/moz.build
--- a/media/webrtc/moz.build
+++ b/media/webrtc/moz.build
@@ -75,16 +75,17 @@ GYP_DIRS['trunk'].sandbox_vars['ALLOW_CO
 GYP_DIRS['trunk'].sandbox_vars['FINAL_LIBRARY'] = 'webrtc'
 GYP_DIRS['trunk'].non_unified_sources += webrtc_non_unified_sources
 
 if CONFIG['MOZ_WEBRTC_SIGNALING']:
     DIRS += [
         'signaling/src/jsep',
         'signaling/src/media-conduit',
         'signaling/src/mediapipeline',
+        'signaling/src/peerconnection',
         'signaling/src/sdp'
     ]
     GYP_DIRS += ['signaling']
     GYP_DIRS['signaling'].input = 'signaling/signaling.gyp'
     GYP_DIRS['signaling'].variables = gyp_vars_copy.copy()
     GYP_DIRS['signaling'].variables.update(
         build_for_test=0,
         build_for_standalone=0
--- a/media/webrtc/signaling/signaling.gyp
+++ b/media/webrtc/signaling/signaling.gyp
@@ -95,25 +95,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',
@@ -151,24 +142,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,33 @@
+# -*- 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('/media/webrtc/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'