Bug 1665166 - Updates to moz.build files; r=ng

Depends on D91318 Differential Revision: https://phabricator.services.mozilla.com/D91319
dothq · Sep 24, 2020 · 4556252 · 4556252
1 parent e800fc9
commit 4556252
Show file tree

Hide file tree

Showing 17 changed files with 109 additions and 125 deletions.
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
@@ -95,9 +95,9 @@ LOCAL_INCLUDES += [
     '/layout/style',
     '/layout/xul/tree',
     '/media/webrtc/',
-    '/media/webrtc/trunk/',
-    '/media/webrtc/trunk/webrtc/',
     '/netwerk/base/',
+    '/third_party/libwebrtc',
+    '/third_party/libwebrtc/webrtc',
 ]
 
 LOCAL_INCLUDES += ['/third_party/msgpack/include']

diff --git a/dom/media/bridge/moz.build b/dom/media/bridge/moz.build
@@ -23,8 +23,8 @@ LOCAL_INCLUDES += [
     '/dom/media/webrtc/transportbridge',
     '/ipc/chromium/src',
     '/media/webrtc/',
-    '/media/webrtc/trunk/',
-    '/media/webrtc/trunk/webrtc/',
+    '/third_party/libwebrtc',
+    '/third_party/libwebrtc/webrtc',
 ]
 
 if CONFIG['MOZ_WEBRTC']:

diff --git a/dom/media/gtest/moz.build b/dom/media/gtest/moz.build
@@ -4,14 +4,14 @@
 # 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')
+include('/dom/media/webrtc/third_party_build/webrtc.mozbuild')
 
 DEFINES['ENABLE_SET_CUBEB_BACKEND'] = True
 
 LOCAL_INCLUDES += [
-    '/dom/media/webrtc/common',
-    '/media/webrtc/trunk',
-    '/media/webrtc/trunk/webrtc'
+    '/dom/media/webrtc/common/',
+    '/third_party/libwebrtc',
+    '/third_party/libwebrtc/webrtc',
 ]
 
 UNIFIED_SOURCES += [

diff --git a/dom/media/moz.build b/dom/media/moz.build
@@ -3,7 +3,7 @@
 # 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')
+include('/dom/media/webrtc/third_party_build/webrtc.mozbuild')
 
 with Files('*'):
     BUG_COMPONENT = ('Core', 'Audio/Video')
@@ -372,8 +372,8 @@ LOCAL_INCLUDES += [
 if CONFIG['MOZ_WEBRTC']:
     LOCAL_INCLUDES += [
         '/dom/media/webrtc/common',
-        '/media/webrtc/trunk',
-        '/media/webrtc/trunk/webrtc',
+        '/third_party/libwebrtc',
+        '/third_party/libwebrtc/webrtc',
     ]
 
 DEFINES['MOZILLA_INTERNAL_API'] = True

diff --git a/dom/media/systemservices/moz.build b/dom/media/systemservices/moz.build
@@ -3,7 +3,7 @@
 # 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')
+include('/dom/media/webrtc/third_party_build/webrtc.mozbuild')
 
 if CONFIG['MOZ_WEBRTC']:
     EXPORTS += [
@@ -21,8 +21,8 @@ if CONFIG['MOZ_WEBRTC']:
     LOCAL_INCLUDES += [
         '/dom/media/webrtc',
         '/media/libyuv/libyuv/include',
-        '/media/webrtc/trunk',
-        '/media/webrtc/trunk/webrtc',
+        '/third_party/libwebrtc',
+        '/third_party/libwebrtc/webrtc',
     ]
 
     if CONFIG['OS_TARGET'] == 'Android':

diff --git a/dom/media/webrtc/common/moz.build b/dom/media/webrtc/common/moz.build
@@ -3,16 +3,15 @@
 # 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')
+include('/dom/media/webrtc/third_party_build/webrtc.mozbuild')
 
 EXPORTS.mozilla.dom += [
     'CandidateInfo.h'
 ]
 
 LOCAL_INCLUDES += [
     '/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr',
-    '/media/webrtc/trunk',
-    '/media/webrtc/trunk/webrtc',
+    '/third_party/libwebrtc/webrtc',
 ]
 
 UNIFIED_SOURCES += [

diff --git a/dom/media/webrtc/jsapi/moz.build b/dom/media/webrtc/jsapi/moz.build
@@ -3,7 +3,7 @@
 # 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')
+include('/dom/media/webrtc/third_party_build/webrtc.mozbuild')
 
 LOCAL_INCLUDES += [
     '!/ipc/ipdl/_ipdlheaders',
@@ -12,9 +12,9 @@ LOCAL_INCLUDES += [
     '/dom/media/webrtc',
     '/ipc/chromium/src',
     '/media/webrtc',
-    '/media/webrtc/trunk',
-    '/media/webrtc/trunk/webrtc',
     '/netwerk/srtp/src/include',
+    '/third_party/libwebrtc',
+    '/third_party/libwebrtc/webrtc',
 ]
 
 UNIFIED_SOURCES += [

diff --git a/dom/media/webrtc/jsep/moz.build b/dom/media/webrtc/jsep/moz.build
@@ -3,13 +3,13 @@
 # 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')
+include('/dom/media/webrtc/third_party_build/webrtc.mozbuild')
 
 LOCAL_INCLUDES += [
     '/dom/media/webrtc',
     '/media/webrtc',
-    '/media/webrtc/trunk',
-    '/media/webrtc/trunk/webrtc',
+    '/third_party/libwebrtc',
+    '/third_party/libwebrtc/webrtc',
     '/third_party/sipcc',
 ]
 

diff --git a/dom/media/webrtc/libwebrtcglue/moz.build b/dom/media/webrtc/libwebrtcglue/moz.build
@@ -3,7 +3,7 @@
 # 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')
+include('/dom/media/webrtc/third_party_build/webrtc.mozbuild')
 
 LOCAL_INCLUDES += [
     '!/ipc/ipdl/_ipdlheaders',
@@ -12,8 +12,8 @@ LOCAL_INCLUDES += [
     '/ipc/chromium/src',
     '/media/libyuv/libyuv/include',
     '/media/webrtc',
-    '/media/webrtc/trunk',
-    '/media/webrtc/trunk/webrtc',
+    '/third_party/libwebrtc',
+    '/third_party/libwebrtc/webrtc',
 ]
 
 UNIFIED_SOURCES += [

diff --git a/dom/media/webrtc/moz.build b/dom/media/webrtc/moz.build
@@ -3,7 +3,7 @@
 # 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')
+include('/dom/media/webrtc/third_party_build/webrtc.mozbuild')
 
 with Files('**'):
     BUG_COMPONENT = ('Core', 'WebRTC: Audio/Video')
@@ -62,8 +62,8 @@ if CONFIG['MOZ_WEBRTC']:
         '/dom/media/webrtc/common',
         '/dom/media/webrtc/common/browser_logging',
         '/media/libyuv/libyuv/include',
-        '/media/webrtc/trunk',
-        '/media/webrtc/trunk/webrtc'
+        '/third_party/libwebrtc',
+        '/third_party/libwebrtc/webrtc',
     ]
 
 if CONFIG['MOZ_WEBRTC_SIGNALING']:
@@ -72,13 +72,10 @@ if CONFIG['MOZ_WEBRTC_SIGNALING']:
         'jsapi',
         'jsep',
         'libwebrtcglue',
+        'sdp',
+        'third_party_build',
         'transportbridge',
-        'sdp'
     ]
-#    GYP_DIRS += ['trunk/third_party/gflags']
-#    GYP_DIRS['trunk/third_party/gflags'].input = 'trunk/third_party/gflags/gflags.gyp'
-#    GYP_DIRS['trunk/third_party/gflags'].variables = gyp_vars_copy
-#    GYP_DIRS['trunk/third_party/gflags'].sandbox_vars['COMPILE_FLAGS'] = {'WARNINGS_AS_ERRORS': []}
 
     # Avoid warnings from third-party code that we can not modify.
     if CONFIG['CC_TYPE'] == 'clang-cl':

diff --git a/dom/media/webrtc/sdp/moz.build b/dom/media/webrtc/sdp/moz.build
@@ -17,7 +17,6 @@ include('/tools/fuzzing/libfuzzer-config.mozbuild')
 LOCAL_INCLUDES += [
     '/dom/media/webrtc',
     '/media/webrtc',
-    '/media/webrtc/trunk',
     '/third_party/sipcc',
 ]