Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Depends on D91318

Differential Revision: https://phabricator.services.mozilla.com/D91319
This commit is contained in:
Dan Minor 2020-09-24 18:40:21 +00:00
parent e800fc9506
commit 45562522d9
17 changed files with 109 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/bindings/moz.build
View File

@ -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']

4
dom/media/bridge/moz.build
View File

@ -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']:

8
dom/media/gtest/moz.build
View File

@ -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 += [

6
dom/media/moz.build
View File

@ -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

6
dom/media/systemservices/moz.build
View File

@ -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':

5
dom/media/webrtc/common/moz.build
View File

@ -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')
EXPORTS.mozilla.dom += [
'CandidateInfo.h'
@ -11,8 +11,7 @@ EXPORTS.mozilla.dom += [
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 += [

6
dom/media/webrtc/jsapi/moz.build
View File

@ -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 += [

6
dom/media/webrtc/jsep/moz.build
View File

@ -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',
]

6
dom/media/webrtc/libwebrtcglue/moz.build
View File

@ -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 += [

13
dom/media/webrtc/moz.build
View File

@ -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':

1
dom/media/webrtc/sdp/moz.build
View File

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

132
dom/media/webrtc/third_party_build/moz.build
View File

@ -7,97 +7,67 @@
with Files("**"):
BUG_COMPONENT = ("Core", "WebRTC")
with Files("signaling/**"):
BUG_COMPONENT = ("Core", "WebRTC: Signaling")
include('/build/gyp.mozbuild')
include('/build/gn.mozbuild')
webrtc_non_unified_sources = [
'trunk/webrtc/common_audio/vad/vad_core.c', # Because of name clash in the kInitCheck variable
'trunk/webrtc/common_audio/vad/webrtc_vad.c', # Because of name clash in the kInitCheck variable
'trunk/webrtc/modules/audio_coding/acm2/codec_manager.cc', # Because of duplicate IsCodecRED/etc
'trunk/webrtc/modules/audio_coding/codecs/g722/g722_decode.c', # Because of name clash in the saturate function
'trunk/webrtc/modules/audio_coding/codecs/g722/g722_encode.c', # Because of name clash in the saturate function
'trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/decode_plc.c', # Because of name clash in the exp2_Q10_T function
'trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c', # Because of name clash in the exp2_Q10_T function
'trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c', # Because of name clash in the kDampFilter variable
'trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c', # Because of name clash in the kDampFilter variable
'trunk/webrtc/modules/audio_coding/neteq/audio_vector.cc', # Because of explicit template specializations
'trunk/webrtc/modules/audio_device/android/audio_manager.cc', # Because of TAG redefinition
'trunk/webrtc/modules/audio_device/android/audio_record_jni.cc', # Becuse of commonly named module static vars
'trunk/webrtc/modules/audio_device/android/audio_track_jni.cc', # Becuse of commonly named module static vars
'trunk/webrtc/modules/audio_device/android/opensles_player.cc', # Because of TAG redefinition
'trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc', # Because of LATE()
'trunk/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc',# Because of LATE()
'trunk/webrtc/modules/audio_device/win/audio_device_core_win.cc', # Because of ordering assumptions in strsafe.h
'trunk/webrtc/modules/audio_processing/aec/echo_cancellation.cc', # Because of conflicts over 'near' on windows
'trunk/webrtc/modules/audio_processing/aecm/aecm_core.cc', # Because of the PART_LEN2 define
'trunk/webrtc/modules/audio_processing/aecm/aecm_core_c.cc', # Because of the PART_LEN2 define
'trunk/webrtc/modules/audio_processing/aecm/aecm_core_mips.cc', # Because of the PART_LEN2 define
'trunk/webrtc/modules/audio_processing/aecm/aecm_core_neon.cc', # Because of the PART_LEN2 define
'trunk/webrtc/modules/audio_processing/aecm/echo_control_mobile.cc', # Because of the PART_LEN2 define
'trunk/webrtc/modules/audio_processing/agc/legacy/analog_agc.c', # Because of name clash in the kInitCheck variable
'trunk/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.cc', # Because of needing to define _USE_MATH_DEFINES before including <cmath>
'trunk/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.cc', # Because of needing to define _USE_MATH_DEFINES before including <cmath>
'trunk/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc', # Because of needing to define _USE_MATH_DEFINES before including <cmath>
'trunk/webrtc/modules/audio_processing/echo_cancellation_impl.cc', # Because of name clash in the MapError function
'trunk/webrtc/modules/audio_processing/echo_control_mobile_impl.cc', # Because of name clash in the MapError function
'trunk/webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc', # Because of kAlpha
'trunk/webrtc/modules/audio_processing/gain_control_impl.cc', # Because of name clash in the Handle typedef
'trunk/webrtc/modules/audio_processing/noise_suppression_impl.cc', # Because of name clash in the Handle typedef
'trunk/webrtc/modules/audio_processing/rms_level.cc', # Because of name clash in the kMinLevel variable
'trunk/webrtc/modules/congestion_controller/trendline_estimator.cc', # Because of name clash in kDeltaCounterMax
'trunk/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc', # Because base/logging.h uses #ifndef LOG before defining anything
'trunk/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc', # Because of duplicate definitions of static consts against remote_bitrate_estimator_abs_send_time.cc
'trunk/webrtc/modules/rtp_rtcp/source/flexfec_receiver.cc', # Because of identically named functions and vars between flexfec_receiver.cc and flexfec_sender.cc in an anonymous namespaces
'trunk/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc', # Because of identically named functions and vars between tmmbr.cc and tmmbn.cc in an anonymous namespaces
'trunk/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc', # Because of identically named functions and vars between tmmbr.cc and tmmbn.cc in an anonymous namespaces
'trunk/webrtc/modules/rtp_rtcp/source/ulpfec_generator.cc', # Because of identically named constant kRedForFecHeaderLength in an anonymous namespace
'trunk/webrtc/modules/video_capture/windows/device_info_ds.cc', # Because of the MEDIASUBTYPE_HDYC variable
'trunk/webrtc/modules/video_capture/windows/help_functions_ds.cc', # Because of initguid.h
'trunk/webrtc/modules/video_capture/windows/sink_filter_ds.cc', # Because of the MEDIASUBTYPE_HDYC variable and initguid.h
'trunk/webrtc/video/overuse_frame_detector.cc', # Because of name clash with call_stats.cc on kWeightFactor
'../../../../third_party/libwebrtc/webrtc/common_audio/vad/vad_core.c', # Because of name clash in the kInitCheck variable
'../../../../third_party/libwebrtc/webrtc/common_audio/vad/webrtc_vad.c', # Because of name clash in the kInitCheck variable
'../../../../third_party/libwebrtc/webrtc/modules/audio_coding/acm2/codec_manager.cc', # Because of duplicate IsCodecRED/etc
'../../../../third_party/libwebrtc/webrtc/modules/audio_coding/codecs/g722/g722_decode.c', # Because of name clash in the saturate function
'../../../../third_party/libwebrtc/webrtc/modules/audio_coding/codecs/g722/g722_encode.c', # Because of name clash in the saturate function
'../../../../third_party/libwebrtc/webrtc/modules/audio_coding/codecs/isac/fix/source/decode_plc.c', # Because of name clash in the exp2_Q10_T function
'../../../../third_party/libwebrtc/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c', # Because of name clash in the exp2_Q10_T function
'../../../../third_party/libwebrtc/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c', # Because of name clash in the kDampFilter variable
'../../../../third_party/libwebrtc/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c', # Because of name clash in the kDampFilter variable
'../../../../third_party/libwebrtc/webrtc/modules/audio_coding/neteq/audio_vector.cc', # Because of explicit template specializations
'../../../../third_party/libwebrtc/webrtc/modules/audio_device/android/audio_manager.cc', # Because of TAG redefinition
'../../../../third_party/libwebrtc/webrtc/modules/audio_device/android/audio_record_jni.cc', # Becuse of commonly named module static vars
'../../../../third_party/libwebrtc/webrtc/modules/audio_device/android/audio_track_jni.cc', # Becuse of commonly named module static vars
'../../../../third_party/libwebrtc/webrtc/modules/audio_device/android/opensles_player.cc', # Because of TAG redefinition
'../../../../third_party/libwebrtc/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc', # Because of LATE()
'../../../../third_party/libwebrtc/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc',# Because of LATE()
'../../../../third_party/libwebrtc/webrtc/modules/audio_device/win/audio_device_core_win.cc', # Because of ordering assumptions in strsafe.h
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/aec/echo_cancellation.cc', # Because of conflicts over 'near' on windows
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/aecm/aecm_core.cc', # Because of the PART_LEN2 define
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/aecm/aecm_core_c.cc', # Because of the PART_LEN2 define
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/aecm/aecm_core_mips.cc', # Because of the PART_LEN2 define
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/aecm/aecm_core_neon.cc', # Because of the PART_LEN2 define
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/aecm/echo_control_mobile.cc', # Because of the PART_LEN2 define
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/agc/legacy/analog_agc.c', # Because of name clash in the kInitCheck variable
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.cc', # Because of needing to define _USE_MATH_DEFINES before including <cmath>
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.cc', # Because of needing to define _USE_MATH_DEFINES before including <cmath>
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc', # Because of needing to define _USE_MATH_DEFINES before including <cmath>
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/echo_cancellation_impl.cc', # Because of name clash in the MapError function
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/echo_control_mobile_impl.cc', # Because of name clash in the MapError function
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc', # Because of kAlpha
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/gain_control_impl.cc', # Because of name clash in the Handle typedef
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/noise_suppression_impl.cc', # Because of name clash in the Handle typedef
'../../../../third_party/libwebrtc/webrtc/modules/audio_processing/rms_level.cc', # Because of name clash in the kMinLevel variable
'../../../../third_party/libwebrtc/webrtc/modules/congestion_controller/trendline_estimator.cc', # Because of name clash in kDeltaCounterMax
'../../../../third_party/libwebrtc/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc', # Because base/logging.h uses #ifndef LOG before defining anything
'../../../../third_party/libwebrtc/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc', # Because of duplicate definitions of static consts against remote_bitrate_estimator_abs_send_time.cc
'../../../../third_party/libwebrtc/webrtc/modules/rtp_rtcp/source/flexfec_receiver.cc', # Because of identically named functions and vars between flexfec_receiver.cc and flexfec_sender.cc in an anonymous namespaces
'../../../../third_party/libwebrtc/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.cc', # Because of identically named functions and vars between tmmbr.cc and tmmbn.cc in an anonymous namespaces
'../../../../third_party/libwebrtc/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.cc', # Because of identically named functions and vars between tmmbr.cc and tmmbn.cc in an anonymous namespaces
'../../../../third_party/libwebrtc/webrtc/modules/rtp_rtcp/source/ulpfec_generator.cc', # Because of identically named constant kRedForFecHeaderLength in an anonymous namespace
'../../../../third_party/libwebrtc/webrtc/modules/video_capture/windows/device_info_ds.cc', # Because of the MEDIASUBTYPE_HDYC variable
'../../../../third_party/libwebrtc/webrtc/modules/video_capture/windows/help_functions_ds.cc', # Because of initguid.h
'../../../../third_party/libwebrtc/webrtc/modules/video_capture/windows/sink_filter_ds.cc', # Because of the MEDIASUBTYPE_HDYC variable and initguid.h
'../../../../third_party/libwebrtc/webrtc/video/overuse_frame_detector.cc', # Because of name clash with call_stats.cc on kWeightFactor
]
# Set gyp vars that webrtc needs when building under various analysis tools.
# Primarily this prevents webrtc from setting NVALGRIND and breaking builds.
gyp_vars_copy = gyp_vars.copy()
if CONFIG['MOZ_VALGRIND']:
gyp_vars_copy.update(build_for_tool="memcheck")
elif CONFIG['MOZ_ASAN']:
gyp_vars_copy.update(build_for_tool="asan")
elif CONFIG['MOZ_TSAN']:
gyp_vars_copy.update(build_for_tool="tsan")
GN_DIRS += ['trunk/webrtc']
GN_DIRS += ['../../../../third_party/libwebrtc/webrtc']
gn_vars_copy = gn_vars.copy()
GN_DIRS['trunk/webrtc'].variables = gn_vars_copy
GN_DIRS['trunk/webrtc'].mozilla_flags = [
GN_DIRS['../../../../third_party/libwebrtc/webrtc'].variables = gn_vars_copy
GN_DIRS['../../../../third_party/libwebrtc/webrtc'].mozilla_flags = [
'-fobjc-arc',
'-mfpu=neon',
'-msse2',
]
GN_DIRS['trunk/webrtc'].gn_target = '//:webrtc'
GN_DIRS['../../../../third_party/libwebrtc/webrtc'].gn_target = '//:webrtc'
# We allow warnings for third-party code that can be updated from upstream.
GN_DIRS['trunk/webrtc'].sandbox_vars['COMPILE_FLAGS'] = {'WARNINGS_AS_ERRORS': []}
GN_DIRS['trunk/webrtc'].sandbox_vars['FINAL_LIBRARY'] = 'webrtc'
GN_DIRS['trunk/webrtc'].non_unified_sources += webrtc_non_unified_sources
if CONFIG['MOZ_WEBRTC_SIGNALING']:
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':
CXXFLAGS += ['-Wno-invalid-source-encoding']
if CONFIG['ENABLE_TESTS']:
TEST_DIRS += [
'signaling/gtest',
]
GN_DIRS['../../../../third_party/libwebrtc/webrtc'].sandbox_vars['COMPILE_FLAGS'] = {'WARNINGS_AS_ERRORS': []}
GN_DIRS['../../../../third_party/libwebrtc/webrtc'].sandbox_vars['FINAL_LIBRARY'] = 'webrtc'
GN_DIRS['../../../../third_party/libwebrtc/webrtc'].non_unified_sources += webrtc_non_unified_sources

6
dom/media/webrtc/transportbridge/moz.build
View File

@ -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,10 +12,10 @@ LOCAL_INCLUDES += [
'/ipc/chromium/src',
'/media/libyuv/libyuv/include',
'/media/webrtc',
'/media/webrtc/trunk',
'/media/webrtc/trunk/webrtc',
'/netwerk/srtp/src/crypto/include',
'/netwerk/srtp/src/include',
'/third_party/libwebrtc',
'/third_party/libwebrtc/webrtc',
]
UNIFIED_SOURCES += [

6
ipc/glue/moz.build
View File

@ -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')
EXPORTS += [
'nsIIPCSerializableInputStream.h',
@ -198,9 +198,9 @@ LOCAL_INCLUDES += [
'/dom/broadcastchannel',
'/dom/indexedDB',
'/dom/storage',
'/media/webrtc/trunk',
'/media/webrtc/trunk/webrtc',
'/netwerk/base',
'/third_party/libwebrtc',
'/third_party/libwebrtc/webrtc',
'/xpcom/build',
]

16
media/webrtc/moz.build Normal file
View File

@ -0,0 +1,16 @@
# 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/.
with Files("signaling/**"):
BUG_COMPONENT = ("Core", "WebRTC: Signaling")
if CONFIG['MOZ_WEBRTC_SIGNALING']:
# Avoid warnings from third-party code that we can not modify.
if CONFIG['CC_TYPE'] == 'clang-cl':
CXXFLAGS += ['-Wno-invalid-source-encoding']
if CONFIG['ENABLE_TESTS']:
TEST_DIRS += [
'signaling/gtest',
]

6
media/webrtc/signaling/gtest/moz.build
View File

@ -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['OS_TARGET'] == 'WINNT':
DEFINES['SIP_OS_WINDOWS'] = True
@ -29,9 +29,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'uikit' and CONFIG['OS_TARGET'] != 'Android'
'/dom/media/webrtc/transportbridge',
'/ipc/chromium/src',
'/media/webrtc/',
'/media/webrtc/trunk',
'/media/webrtc/trunk/webrtc',
'/netwerk/srtp/src/include',
'/third_party/libwebrtc',
'/third_party/libwebrtc/webrtc',
'/third_party/sipcc',
]

3
third_party/moz.build vendored
View File

@ -37,5 +37,8 @@ with Files('sqlite3/**'):
with Files('rlbox/**'):
BUG_COMPONENT = ('Firefox Build System', 'General')
with Files("libwebrtc/**"):
BUG_COMPONENT = ("Core", "WebRTC")
with Files('WinToast/**'):
BUG_COMPONENT = ('Toolkit', 'General')