Bug 1382182 - Build mediapipeline using moz.build; r=ted,jesup

MozReview-Commit-ID: 7yJMgrsCgzO

--HG--
extra : rebase_source : f2a076b9a944795ee18232043f082590134529fc

media/webrtc/moz.build

@@ -79,6 +79,7 @@ if CONFIG['MOZ_WEBRTC_SIGNALING']:
     DIRS += [
         'signaling/src/jsep',
         'signaling/src/media-conduit',
+        'signaling/src/mediapipeline',
         'signaling/src/sdp'
     ]
     GYP_DIRS += ['signaling']

media/webrtc/signaling/signaling.gyp

@@ -109,13 +109,6 @@
         './src/peerconnection/PeerConnectionImpl.h',
         './src/peerconnection/PeerConnectionMedia.cpp',
         './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',
       ],
 
       #
@@ -149,20 +142,6 @@
       # Conditionals
       #
       'conditions': [
-        # hack so I can change the include flow for SrtpFlow
-        ['build_with_mozilla==1', {
-          'sources': [
-            './src/mediapipeline/SrtpFlow.h',
-            './src/mediapipeline/SrtpFlow.cpp',
-          ],
-          'include_dirs!': [
-            '../trunk/webrtc',
-          ],
-          'include_dirs': [
-            '../../../netwerk/srtp/src/include',
-            '../../../netwerk/srtp/src/crypto/include',
-          ],
-        }],
         ['moz_webrtc_mediacodec==1', {
           'include_dirs': [
             '../../../widget/android',

media/webrtc/signaling/src/mediapipeline/moz.build

@@ -0,0 +1,27 @@
+# -*- 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 += [
+    '/dom/media',
+    '/media/libyuv/libyuv/include',
+    '/media/mtransport',
+    '/media/webrtc',
+    '/media/webrtc/signaling/src/media-conduit',
+    '/media/webrtc/trunk',
+    '/netwerk/srtp/src/crypto/include',
+    '/netwerk/srtp/src/include',
+]
+
+# Duplicate definition of getLogModule
+SOURCES += [
+    'MediaPipeline.cpp',
+    'MediaPipelineFilter.cpp',
+    'RtpLogger.cpp',
+    'SrtpFlow.cpp',
+]
+
+FINAL_LIBRARY = 'xul'