Bug 786234 - Part 2.2: Compensate for some build system gotchas. r=abr
authorByron Campen [:bwc] <docfaraday@gmail.com>
Tue, 14 Jan 2014 16:31:27 -0800
changeset 189558 ecdff005cbe3d609cd96dd200aed0d1c9bd4aa43
parent 189557 33039b7d72e68dfc45b338ad2f626d26a6ec419e
child 189559 afc7283f00e2a7d6f2f541d6b369cb75b0298894
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersabr
bugs786234
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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/peerconnection/WebrtcGlobalInformation.cpp',
         'signaling/src/sipcc/core/ccapp/call_logger.c',
         'signaling/src/sipcc/core/ccapp/capability_set.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 {