Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2022-09-07 11:03:19 +08:00
commit 866ded0b0a
138 changed files with 825 additions and 1086 deletions

View file

@ -13,7 +13,7 @@ if CONFIG['MOZ_WEBRTC']:
'VideoEngine.h',
'VideoFrameUtils.h'
]
SOURCES += [
UNIFIED_SOURCES += [
'CamerasChild.cpp',
'CamerasParent.cpp',
'LoadManager.cpp',
@ -77,8 +77,7 @@ EXPORTS.mozilla.media += ['CamerasTypes.h',
'MediaTaskUtils.h',
'MediaUtils.h',
]
SOURCES += [
UNIFIED_SOURCES += [
'MediaChild.cpp',
'MediaParent.cpp',
'MediaSystemResourceClient.cpp',