Backed out changeset e9b23c66ef10 (bug 1015932)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 28 Jul 2014 11:52:05 +0200
changeset 196379 f408f7da5b2ac8cd9c182bdea58238ad62228c54
parent 196378 8b9f3cc69cbf86830c1afed39e91a6b799d0f730
child 196380 1bab131ebe628f61068edbc0eb22a8fd6615425c
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs1015932
milestone34.0a1
backs oute9b23c66ef1009a9ed38fd399a8ccfb535081637
Backed out changeset e9b23c66ef10 (bug 1015932)
content/media/systemservices/LoadManager.cpp
content/media/systemservices/LoadManager.h
content/media/systemservices/LoadManagerFactory.cpp
content/media/systemservices/LoadManagerFactory.h
content/media/systemservices/LoadMonitor.cpp
content/media/systemservices/LoadMonitor.h
content/media/systemservices/moz.build
content/media/webrtc/LoadManager.cpp
content/media/webrtc/LoadManager.h
content/media/webrtc/LoadManagerFactory.cpp
content/media/webrtc/LoadManagerFactory.h
content/media/webrtc/LoadMonitor.cpp
content/media/webrtc/LoadMonitor.h
content/media/webrtc/moz.build
--- a/content/media/systemservices/moz.build
+++ b/content/media/systemservices/moz.build
@@ -1,27 +1,14 @@
 # -*- Mode: python; c-basic-offset: 4; 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/.
 
-if CONFIG['MOZ_WEBRTC']:
-    EXPORTS += ['LoadManager.h',
-                'LoadManagerFactory.h',
-                'LoadMonitor.h',
-    ]
-    UNIFIED_SOURCES += ['LoadManager.cpp',
-                        'LoadManagerFactory.cpp',
-                        'LoadMonitor.cpp',
-    ]
-    LOCAL_INCLUDES += [
-        '/media/webrtc/trunk',
-    ]
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     EXPORTS += [
         'OpenSLESProvider.h'
     ]
     UNIFIED_SOURCES += [
         'OpenSLESProvider.cpp',
     ]
 
rename from content/media/systemservices/LoadManager.cpp
rename to content/media/webrtc/LoadManager.cpp
rename from content/media/systemservices/LoadManager.h
rename to content/media/webrtc/LoadManager.h
rename from content/media/systemservices/LoadManagerFactory.cpp
rename to content/media/webrtc/LoadManagerFactory.cpp
rename from content/media/systemservices/LoadManagerFactory.h
rename to content/media/webrtc/LoadManagerFactory.h
rename from content/media/systemservices/LoadMonitor.cpp
rename to content/media/webrtc/LoadMonitor.cpp
rename from content/media/systemservices/LoadMonitor.h
rename to content/media/webrtc/LoadMonitor.h
--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@@ -9,18 +9,24 @@ XPIDL_MODULE = 'content_webrtc'
 EXPORTS += [
     'MediaEngine.h',
     'MediaEngineDefault.h',
     'MediaTrackConstraints.h',
 ]
 
 if CONFIG['MOZ_WEBRTC']:
     EXPORTS += ['AudioOutputObserver.h',
+                'LoadManager.h',
+                'LoadManagerFactory.h',
+                'LoadMonitor.h',
                 'MediaEngineWebRTC.h']
     UNIFIED_SOURCES += [
+        'LoadManager.cpp',
+        'LoadManagerFactory.cpp',
+        'LoadMonitor.cpp',
         'MediaEngineTabVideoSource.cpp',
         'MediaEngineWebRTCAudio.cpp',
         'MediaEngineWebRTCVideo.cpp',
     ]
     # MediaEngineWebRTC.cpp needs to be built separately.
     SOURCES += [
         'MediaEngineWebRTC.cpp',
     ]