generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename GYP and GN targets for video capture+render.

Browse Source 
This CL performs the following renames of targets to
make GYP and GN more unified and make the targets that
have the same name as the module and include the external
render/capture implementation (the internal one is only
used by WebRTC tests).
This makes it natural to declare dependencies in GN
without having to specify the target.

Summary of the renames:
GYP:
video_render_module_impl -> video_render (new target)
video_capture_module_impl -> video_capture (new target)

GN:
video_capture -> video_capture_module (now identical to the GYP target)
video_capture_impl -> video_capture

video_render -> video_render_module (now identical to the GYP target)
video_render_impl -> video_render

BUG=456815
R=andresp@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/35099004

Cr-Commit-Position: refs/heads/master@{#8323}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8323 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2015-02-11 07:47:00 +00:00
parent 2c29c2eae2
commit f58fe0ab2b
11 changed files with 55 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
talk/libjingle.gyp
View File

@ -461,8 +461,8 @@
'conditions': [
['build_with_chromium==1', {
'dependencies': [
'<(webrtc_root)/modules/modules.gyp:video_capture_module_impl',
'<(webrtc_root)/modules/modules.gyp:video_render_module_impl',
'<(webrtc_root)/modules/modules.gyp:video_capture',
'<(webrtc_root)/modules/modules.gyp:video_render',
],
}, {
'dependencies': [

9
webrtc/BUILD.gn
View File

@ -209,16 +209,21 @@ source_set("webrtc") {
"modules/media_file",
"modules/rtp_rtcp",
"modules/utility",
"modules/video_capture",
"modules/video_coding",
"modules/video_processing",
"modules/video_render",
"system_wrappers",
"tools",
"video",
"video_engine",
"voice_engine",
]
if (build_with_chromium) {
deps += [
"modules/video_capture",
"modules/video_render",
]
}
}
if (!build_with_chromium) {

2
webrtc/modules/modules.gyp
View File

@ -79,7 +79,7 @@
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
'<(webrtc_root)/modules/modules.gyp:video_capture_module_impl',
'<(webrtc_root)/modules/modules.gyp:video_capture',
'<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8',
'<(webrtc_root)/modules/video_coding/codecs/vp9/vp9.gyp:webrtc_vp9',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',

10
webrtc/modules/video_capture/BUILD.gn
View File

@ -9,10 +9,10 @@
import("../../build/webrtc.gni")
# Note this target is missing an implementation for the video capture.
# Targets must link with either 'video_capture_impl' or
# Targets must link with either 'video_capture' or
# 'video_capture_internal_impl' depending on whether they want to
# use the internal capturer.
source_set("video_capture") {
source_set("video_capture_module") {
sources = [
"device_info_impl.cc",
"device_info_impl.h",
@ -42,14 +42,14 @@ source_set("video_capture") {
}
}
source_set("video_capture_impl") {
source_set("video_capture") {
sources = [
"external/device_info_external.cc",
"external/video_capture_external.cc",
]
deps = [
":video_capture",
":video_capture_module",
"../../system_wrappers",
]
@ -76,7 +76,7 @@ if (!build_with_chromium) {
source_set("video_capture_internal_impl") {
deps = [
":video_capture",
":video_capture_module",
"../../system_wrappers",
]

14
webrtc/modules/video_capture/video_capture.gypi
View File

@ -10,7 +10,7 @@
'targets': [
{
# Note this library is missing an implementation for the video capture.
# Targets must link with either 'video_capture_module_impl' or
# Targets must link with either 'video_capture' or
# 'video_capture_module_internal_impl' depending on whether they want to
# use the internal capturer.
'target_name': 'video_capture_module',
@ -33,10 +33,20 @@
'video_capture_impl.h',
],
},
{
# TODO(kjellander): Remove this target as soon the
# video_capture_module_impl -> video_capture rename has been rolled into
# Chromium and src/third_party/libjingle/libjingle.gyp has been updated.
'target_name': 'video_capture_module_impl',
'type': 'none',
'dependencies': [
'video_capture',
],
},
{
# Default video capture module implementation that only supports external
# capture.
'target_name': 'video_capture_module_impl',
'target_name': 'video_capture',
'type': 'static_library',
'dependencies': [
'video_capture_module',

8
webrtc/modules/video_render/BUILD.gn
View File

@ -8,7 +8,7 @@
import("../../build/webrtc.gni")
source_set("video_render") {
source_set("video_render_module") {
sources = [
"external/video_render_external_impl.cc",
"external/video_render_external_impl.h",
@ -38,12 +38,12 @@ source_set("video_render") {
}
}
source_set("video_render_impl") {
source_set("video_render") {
sources = [
"video_render_impl.cc",
]
deps = [
":video_render",
":video_render_module",
"../../system_wrappers",
]
@ -73,7 +73,7 @@ if (!build_with_chromium) {
"video_render_internal_impl.cc",
]
deps = [
":video_render",
":video_render_module",
"../../system_wrappers",
]

14
webrtc/modules/video_render/video_render.gypi
View File

@ -10,7 +10,7 @@
'targets': [
{
# Note this library is missing an implementation for the video render.
# For that targets must link with 'video_render_module_impl' or
# For that targets must link with 'video_render' or
# 'video_render_module_internal_impl' if they want to compile and use
# the internal render as the default renderer.
'target_name': 'video_render_module',
@ -33,10 +33,20 @@
'video_render_impl.h',
],
},
{
# TODO(kjellander): Remove this target as soon the
# video_render_module_impl -> video_render rename has been rolled into
# Chromium and src/third_party/libjingle/libjingle.gyp has been updated.
'target_name': 'video_render_module_impl',
'type': 'none',
'dependencies': [
'video_render',
],
},
{
# Default video_render_module implementation that only supports external
# renders.
'target_name': 'video_render_module_impl',
'target_name': 'video_render',
'type': 'static_library',
'dependencies': [
'video_render_module',

4
webrtc/test/webrtc_test_common.gyp
View File

@ -58,7 +58,7 @@
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/base/base.gyp:rtc_base',
'<(webrtc_root)/modules/modules.gyp:media_file',
'<(webrtc_root)/modules/modules.gyp:video_render_module_impl',
'<(webrtc_root)/modules/modules.gyp:video_render',
'<(webrtc_root)/test/test.gyp:frame_generator',
'<(webrtc_root)/test/test.gyp:test_support',
'<(webrtc_root)/test/test.gyp:rtp_test_utils',
@ -151,7 +151,7 @@
'webrtc_test_common',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(webrtc_root)/modules/modules.gyp:video_capture_module_impl',
'<(webrtc_root)/modules/modules.gyp:video_capture',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [

4
webrtc/video_engine/BUILD.gn
View File

@ -113,10 +113,10 @@ source_set("video_engine_core") {
"../modules/bitrate_controller",
"../modules/rtp_rtcp",
"../modules/utility",
"../modules/video_capture",
"../modules/video_capture:video_capture_module",
"../modules/video_coding",
"../modules/video_processing",
"../modules/video_render",
"../modules/video_render:video_render_module",
"../voice_engine",
"../system_wrappers",
]

4
webrtc/webrtc.gyp
View File

@ -86,8 +86,8 @@
# this and no if conditions should be needed on webrtc build files.
['build_with_chromium==1', {
'dependencies': [
'<(webrtc_root)/modules/modules.gyp:video_capture_module_impl',
'<(webrtc_root)/modules/modules.gyp:video_render_module_impl',
'<(webrtc_root)/modules/modules.gyp:video_capture',
'<(webrtc_root)/modules/modules.gyp:video_render',
],
}],
],

12
webrtc/webrtc_tests.gypi
View File

@ -57,7 +57,7 @@
'test/webrtc_test_common.gyp:webrtc_test_common',
'test/webrtc_test_common.gyp:webrtc_test_renderer',
'<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl',
'<(webrtc_root)/modules/modules.gyp:video_render_module_impl',
'<(webrtc_root)/modules/modules.gyp:video_render',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
'test/test.gyp:test_main',
'webrtc',
@ -84,8 +84,8 @@
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'test/webrtc_test_common.gyp:webrtc_test_common',
'test/webrtc_test_common.gyp:webrtc_test_renderer',
'<(webrtc_root)/modules/modules.gyp:video_capture_module_impl',
'<(webrtc_root)/modules/modules.gyp:video_render_module_impl',
'<(webrtc_root)/modules/modules.gyp:video_capture',
'<(webrtc_root)/modules/modules.gyp:video_render',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
'webrtc',
],
@ -108,8 +108,8 @@
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
'<(webrtc_root)/modules/modules.gyp:video_capture_module_impl',
'<(webrtc_root)/modules/modules.gyp:video_render_module_impl',
'<(webrtc_root)/modules/modules.gyp:video_capture',
'<(webrtc_root)/modules/modules.gyp:video_render',
'<(webrtc_root)/test/test.gyp:channel_transport',
'<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
'test/metrics.gyp:metrics',
@ -140,7 +140,7 @@
'dependencies': [
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/modules/modules.gyp:video_capture_module_impl',
'<(webrtc_root)/modules/modules.gyp:video_capture',
'<(webrtc_root)/test/test.gyp:channel_transport',
'<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
'modules/modules.gyp:neteq_test_support', # Needed by neteq_performance_unittest.