Bug 1015932 - Add systemservices subdir to content/media. r=jesup
☠☠ backed out by 34b6cf7f14ff ☠ ☠
authorGian-Carlo Pascutto <gpascutto@mozilla.com>
Mon, 28 Jul 2014 08:09:34 +0200
changeset 219172 3af17bad947ff78b7f652f47d62eb431095a2df8
parent 219171 c7024109e9aee61e19f6920aaea3fee9f704b6b6
child 219173 b652396e9fd7a648ff39bd2400223c31df5c7d88
push id583
push userbhearsum@mozilla.com
push dateMon, 24 Nov 2014 19:04:58 +0000
treeherdermozilla-release@c107e74250f4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1015932
milestone34.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 1015932 - Add systemservices subdir to content/media. r=jesup
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
rename from content/media/webrtc/LoadManager.cpp
rename to content/media/systemservices/LoadManager.cpp
rename from content/media/webrtc/LoadManager.h
rename to content/media/systemservices/LoadManager.h
rename from content/media/webrtc/LoadManagerFactory.cpp
rename to content/media/systemservices/LoadManagerFactory.cpp
rename from content/media/webrtc/LoadManagerFactory.h
rename to content/media/systemservices/LoadManagerFactory.h
rename from content/media/webrtc/LoadMonitor.cpp
rename to content/media/systemservices/LoadMonitor.cpp
rename from content/media/webrtc/LoadMonitor.h
rename to content/media/systemservices/LoadMonitor.h
--- a/content/media/systemservices/moz.build
+++ b/content/media/systemservices/moz.build
@@ -1,17 +1,31 @@
 # -*- 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',
     ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
-LIBRARY_NAME = 'gklayout'
+FINAL_LIBRARY = 'gklayout'
--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@@ -9,24 +9,18 @@ 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',
     ]