From 69a46592ee7849582ae3bb5bddeb91019242e6f3 Mon Sep 17 00:00:00 2001 From: Randell Jesup Date: Thu, 29 Jan 2015 18:33:36 -0500 Subject: [PATCH] Bug 1109248: gyp changes to adapt to webrtc.org 40 update r=ted --- build/gyp.mozbuild | 4 +- media/webrtc/moz.build | 2 +- media/webrtc/trunk/peerconnection.gyp | 4 +- media/webrtc/trunk/webrtc/base/base.gyp | 31 ++++++--- media/webrtc/trunk/webrtc/build/common.gypi | 2 +- .../audio_coding/codecs/opus/opus.gypi | 11 ++- .../modules/audio_coding/neteq/neteq.gypi | 67 ++++++++++++++----- .../desktop_capture/desktop_capture.gypi | 2 +- .../modules/video_capture/video_capture.gypi | 8 ++- .../source/system_wrappers.gyp | 5 ++ 10 files changed, 101 insertions(+), 35 deletions(-) diff --git a/build/gyp.mozbuild b/build/gyp.mozbuild index 950804ae45497..282cbc7cb760f 100644 --- a/build/gyp.mozbuild +++ b/build/gyp.mozbuild @@ -22,9 +22,11 @@ gyp_vars = { # use_system_lib* still seems to be in use in trunk/build 'use_system_libjpeg': 0, 'use_system_libvpx': 0, + 'build_json': 0, 'build_libjpeg': 0, - 'build_libvpx': 0, 'build_libyuv': 0, + 'build_libvpx': 0, + 'build_ssl': 0, 'libyuv_dir': '/media/libyuv', 'yuv_disable_avx2': 0 if CONFIG['HAVE_X86_AVX2'] else 1, # don't use openssl diff --git a/media/webrtc/moz.build b/media/webrtc/moz.build index 207a7cab1b2ca..5cc4caaea0562 100644 --- a/media/webrtc/moz.build +++ b/media/webrtc/moz.build @@ -13,7 +13,7 @@ webrtc_non_unified_sources = [ '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/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/neteq4/audio_vector.cc', # Because of explicit template specializations + 'trunk/webrtc/modules/audio_coding/neteq/audio_vector.cc', # Because of explicit template specializations '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/opensl/opensles_input.cc', # Because of name clash in the kOption variable diff --git a/media/webrtc/trunk/peerconnection.gyp b/media/webrtc/trunk/peerconnection.gyp index b235aba43ee07..939926d014c7c 100644 --- a/media/webrtc/trunk/peerconnection.gyp +++ b/media/webrtc/trunk/peerconnection.gyp @@ -35,8 +35,10 @@ 'dependencies': [ 'webrtc/modules/modules.gyp:audio_device', 'webrtc/modules/modules.gyp:video_capture_module', -# 'webrtc/modules/modules.gyp:video_render_module', + 'webrtc/modules/modules.gyp:video_capture_module_internal_impl', + 'webrtc/modules/modules.gyp:video_render_module_impl', # 'webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers', +# 'webrtc/system_wrappers/source/system_wrappers.gyp:metrics_default', 'webrtc/video_engine/video_engine.gyp:video_engine_core', 'webrtc/voice_engine/voice_engine.gyp:voice_engine', ], diff --git a/media/webrtc/trunk/webrtc/base/base.gyp b/media/webrtc/trunk/webrtc/base/base.gyp index 2fd64ba5e246a..222e08c1a8d1f 100644 --- a/media/webrtc/trunk/webrtc/base/base.gyp +++ b/media/webrtc/trunk/webrtc/base/base.gyp @@ -56,6 +56,14 @@ 'timeutils.cc', 'timeutils.h', ], + 'conditions': [ + ['OS=="mac"', { + 'sources': [ + 'macutils.cc', + 'macutils.h', + ], + }], + ], }, { 'target_name': 'rtc_base', @@ -94,13 +102,13 @@ 'basicdefs.h', 'basictypes.h', 'bind.h', - 'bind.h.pump', +# 'bind.h.pump', 'buffer.h', 'bytebuffer.cc', 'bytebuffer.h', 'byteorder.h', 'callback.h', - 'callback.h.pump', +# 'callback.h.pump', 'constructormagic.h', 'common.cc', 'common.h', @@ -149,9 +157,9 @@ 'json.cc', 'json.h', 'latebindingsymboltable.cc', - 'latebindingsymboltable.cc.def', +# 'latebindingsymboltable.cc.def', 'latebindingsymboltable.h', - 'latebindingsymboltable.h.def', +# 'latebindingsymboltable.h.def', 'libdbusglibsymboltable.cc', 'libdbusglibsymboltable.h', 'linux.cc', @@ -171,8 +179,9 @@ 'macconversion.h', 'macsocketserver.cc', 'macsocketserver.h', - 'macutils.cc', - 'macutils.h', +# moved by mozilla +# 'macutils.cc', +# 'macutils.h', 'macwindowpicker.cc', 'macwindowpicker.h', 'mathutils.h', @@ -363,10 +372,10 @@ 'bandwidthsmoother.h', 'basictypes.h', 'bind.h', - 'bind.h.pump', +# 'bind.h.pump', 'buffer.h', 'callback.h', - 'callback.h.pump', +# 'callback.h.pump', 'constructormagic.h', 'dbus.cc', 'dbus.h', @@ -376,15 +385,15 @@ 'filelock.h', 'fileutils_mock.h', 'genericslot.h', - 'genericslot.h.pump', +# 'genericslot.h.pump', 'httpserver.cc', 'httpserver.h', 'json.cc', 'json.h', 'latebindingsymboltable.cc', - 'latebindingsymboltable.cc.def', +# 'latebindingsymboltable.cc.def', 'latebindingsymboltable.h', - 'latebindingsymboltable.h.def', +# 'latebindingsymboltable.h.def', 'libdbusglibsymboltable.cc', 'libdbusglibsymboltable.h', 'linuxfdwalk.c', diff --git a/media/webrtc/trunk/webrtc/build/common.gypi b/media/webrtc/trunk/webrtc/build/common.gypi index e7690b05a30a3..3f78aa87330d3 100644 --- a/media/webrtc/trunk/webrtc/build/common.gypi +++ b/media/webrtc/trunk/webrtc/build/common.gypi @@ -190,7 +190,7 @@ ['target_arch=="arm" or target_arch=="armv7"', { 'prefer_fixed_point%': 1, }], - ['OS!="ios" and (target_arch!="arm" or arm_version>=7)', { + ['OS!="ios" and (target_arch!="arm" or arm_version>=7) and build_with_mozilla==0', { 'rtc_use_openmax_dl%': 1, }, { 'rtc_use_openmax_dl%': 0, diff --git a/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi b/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi index eba320d221c85..af40ebd8d70a0 100644 --- a/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi +++ b/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi @@ -19,7 +19,16 @@ # Mozilla provides its own build of the opus library. 'include_dirs': [ '/media/libopus/include', - ] + '/media/libopus/src', + '/media/libopus/celt', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '/media/libopus/include', + '/media/libopus/src', + '/media/libopus/celt', + ], + }, }, { 'dependencies': [ '<(DEPTH)/third_party/opus/opus.gyp:opus' diff --git a/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi b/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi index 1f4ba4871b49b..30411ed1d902e 100644 --- a/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi +++ b/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi @@ -28,41 +28,76 @@ 'neteq_defines': ['WEBRTC_CODEC_ISAC', 'WEBRTC_CODEC_ISACFIX',], }], ['include_opus==1', { - 'codecs': ['webrtc_opus',], + 'codecs': ['webrtc_opus'], + 'neteq_dependencies': ['webrtc_opus'], 'neteq_defines': ['WEBRTC_CODEC_OPUS',], + 'conditions': [ + ['build_with_mozilla==0', { + 'neteq_dependencies': [ + '<(DEPTH)/third_party/opus/opus.gyp:opus', + ], + }], + ], }], ], 'neteq_dependencies': [ '<@(codecs)', - '<(DEPTH)/third_party/opus/opus.gyp:opus', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', ], + }, 'targets': [ { 'target_name': 'neteq', 'type': 'static_library', + 'include_dirs': [ + '../../../../../../media/opus/celt', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../../../../../../media/opus/celt', + ], + }, 'dependencies': [ '<@(neteq_dependencies)', ], 'defines': [ '<@(neteq_defines)', ], - 'include_dirs': [ - # Need Opus header files for the audio classifier. - '<(DEPTH)/third_party/opus/src/celt', - '<(DEPTH)/third_party/opus/src/src', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - # Need Opus header files for the audio classifier. - '<(DEPTH)/third_party/opus/src/celt', - '<(DEPTH)/third_party/opus/src/src', - ], - }, - 'export_dependent_settings': [ - '<(DEPTH)/third_party/opus/opus.gyp:opus', + 'conditions': [ + ['build_with_mozilla==0', { + 'include_dirs': [ + # Need Opus header files for the audio classifier. + '<(DEPTH)/third_party/opus/src/celt', + '<(DEPTH)/third_party/opus/src/src', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + # Need Opus header files for the audio classifier. + '<(DEPTH)/third_party/opus/src/celt', + '<(DEPTH)/third_party/opus/src/src', + ], + }, + 'export_dependent_settings': [ + '<(DEPTH)/third_party/opus/opus.gyp:opus', + ], + }], + ['build_with_mozilla==1', { + 'include_dirs': [ + # Need Opus header files for the audio classifier. + '<(DEPTH)/../../../media/opus/celt', +# '<(DEPTH)/third_party/opus/src/src', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../../../../../../media/opus/celt', + # Need Opus header files for the audio classifier. + '<(DEPTH)/../../../media/opus/celt', +# '<(DEPTH)/third_party/opus/src/src', + ], + }, + }], ], 'sources': [ 'interface/audio_decoder.h', diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture.gypi b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture.gypi index 0d9fa25bf6b3c..2d113d45cf903 100644 --- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture.gypi +++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture.gypi @@ -16,7 +16,7 @@ 'type': 'static_library', 'dependencies': [ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/base/base.gyp:rtc_base', + '<(webrtc_root)/base/base.gyp:rtc_base_approved', ], 'sources': [ "desktop_and_cursor_composer.cc", diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi b/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi index bd39be014e208..2fe2fb7278c62 100644 --- a/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi +++ b/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi @@ -44,6 +44,9 @@ 'dependencies': [ 'video_capture_module', ], + 'cflags_mozilla': [ + '$(NSPR_CFLAGS)', + ], 'sources': [ 'external/device_info_external.cc', 'external/video_capture_external.cc', @@ -55,6 +58,9 @@ 'dependencies': [ 'video_capture_module', ], + 'cflags_mozilla': [ + '$(NSPR_CFLAGS)', + ], 'conditions': [ ['include_v4l2_video_capture==1', { 'sources': [ @@ -98,8 +104,6 @@ '<(DEPTH)/third_party/winsdk_samples/winsdk_samples.gyp:directshow_baseclasses', ], }], - 'dependencies': [ - '<(DEPTH)/third_party/winsdk_samples/winsdk_samples.gyp:directshow_baseclasses', ], 'sources': [ 'windows/device_info_ds.cc', diff --git a/media/webrtc/trunk/webrtc/system_wrappers/source/system_wrappers.gyp b/media/webrtc/trunk/webrtc/system_wrappers/source/system_wrappers.gyp index 8972b97b903df..0ea0128549a7f 100644 --- a/media/webrtc/trunk/webrtc/system_wrappers/source/system_wrappers.gyp +++ b/media/webrtc/trunk/webrtc/system_wrappers/source/system_wrappers.gyp @@ -130,6 +130,11 @@ 'WEBRTC_LAZY_TRACE_ALLOC', ], }], + ['build_with_mozilla', { + 'sources': [ + 'metrics_default.cc', + ], + }], ['OS=="android" or moz_widget_toolkit_gonk==1', { 'defines': [ 'WEBRTC_THREAD_RR',