Bug 786234 - Part 2.2: Compensate for some build system gotchas. r=abr
☠☠ backed out by 1582d179f029 ☠ ☠
authorByron Campen [:bwc] <docfaraday@gmail.com>
Tue, 14 Jan 2014 16:31:27 -0800
changeset 170541 53d8b186e5742151279233834e73eb0eef02a6c9
parent 170540 1dea344fa608897709f2e674ee726ec858c21da2
child 170542 c5334aea64331b9dcc282082cd16a5511917e53d
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersabr
bugs786234
milestone30.0a1
Bug 786234 - Part 2.2: Compensate for some build system gotchas. r=abr
media/webrtc/moz.build
media/webrtc/signaling/src/mediapipeline/MediaPipelineFilter.cpp
--- a/media/webrtc/moz.build
+++ b/media/webrtc/moz.build
@@ -59,16 +59,17 @@ if CONFIG['MOZ_WEBRTC_SIGNALING']:
         'signaling/src/callcontrol/CallControlManagerImpl.cpp',
         'signaling/src/common/browser_logging/CSFLog.cpp',
         'signaling/src/media-conduit/AudioConduit.cpp',
         'signaling/src/media-conduit/VideoConduit.cpp',
         'signaling/src/media/CSFAudioControlWrapper.cpp',
         'signaling/src/media/CSFVideoControlWrapper.cpp',
         'signaling/src/media/VcmSIPCCBinding.cpp',
         'signaling/src/mediapipeline/MediaPipeline.cpp',
+        'signaling/src/mediapipeline/MediaPipelineFilter.cpp',
         'signaling/src/mediapipeline/SrtpFlow.cpp',
         'signaling/src/peerconnection/MediaStreamList.cpp',
         'signaling/src/peerconnection/PeerConnectionCtx.cpp',
         'signaling/src/peerconnection/PeerConnectionImpl.cpp',
         'signaling/src/peerconnection/PeerConnectionMedia.cpp',
         'signaling/src/sipcc/core/ccapp/call_logger.c',
         'signaling/src/sipcc/core/ccapp/capability_set.c',
         'signaling/src/sipcc/core/ccapp/cc_call_feature.c',
--- a/media/webrtc/signaling/src/mediapipeline/MediaPipelineFilter.cpp
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipelineFilter.cpp
@@ -2,19 +2,19 @@
 /* vim: softtabstop=2:shiftwidth=2:expandtab
  * */
 /* 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/. */
 
 // Original author: bcampen@mozilla.com
 
-#include "MediaPipelineFilter.h"
+#include "logging.h"
 
-#include "logging.h"
+#include "MediaPipelineFilter.h"
 
 #include "webrtc/modules/interface/module_common_types.h"
 
 // Logging context
 MOZ_MTLOG_MODULE("mediapipeline")
 
 namespace mozilla {