Refactor webrtc/modules/video_{capture,coding} for GN check

This moves some GN check configurations out of .gn to individual targets.
The now checked target is:
"//webrtc/modules/video_capture/*",
"//webrtc/modules/video_coding/*",

BUG=webrtc:6828
NOTRY=True
R=kjellander@webrtc.org

Review-Url: https://codereview.webrtc.org/2555333004
Cr-Commit-Position: refs/heads/master@{#15488}
This commit is contained in:
ehmaldonado 2016-12-08 09:56:16 -08:00 committed by Commit bot
parent f7c6d7231c
commit 36df2d76c5
3 changed files with 42 additions and 0 deletions

2
.gn
View File

@ -28,6 +28,8 @@ check_targets = [
"//webrtc/modules/audio_device/*",
"//webrtc/modules/audio_mixer/*",
"//webrtc/modules/audio_processing/*",
"//webrtc/modules/video_capture/*",
"//webrtc/modules/video_coding/*",
"//webrtc/stats:rtc_stats",
"//webrtc/voice_engine",
"//webrtc/voice_engine:level_indicator",

View File

@ -28,6 +28,7 @@ rtc_static_library("video_capture_module") {
deps = [
"../..:webrtc_common",
"../../base:rtc_base_approved",
"../../common_video",
"../../system_wrappers",
"../utility",
@ -47,6 +48,7 @@ rtc_static_library("video_capture") {
deps = [
":video_capture_module",
"../../base:rtc_base_approved",
"../../system_wrappers",
]
@ -90,6 +92,7 @@ if (!build_with_chromium) {
deps = [
":video_capture_module",
"../../base:rtc_base_approved",
"../../system_wrappers",
]
@ -182,6 +185,9 @@ if (!build_with_chromium) {
deps = [
":video_capture_internal_impl",
":video_capture_module",
"../../base:rtc_base_approved",
"../../common_video:common_video",
"../../system_wrappers:system_wrappers",
"../../system_wrappers:system_wrappers_default",
"../../test:video_test_common",
"../utility",

View File

@ -94,12 +94,21 @@ rtc_static_library("video_coding") {
":webrtc_vp9",
"../..:webrtc_common",
"../../base:rtc_analytics",
"../../base:rtc_base",
"../../base:rtc_base_approved",
"../../base:rtc_task_queue",
"../../common_video",
"../../system_wrappers",
"../rtp_rtcp:rtp_rtcp",
"../utility:utility",
]
}
rtc_static_library("video_coding_utility") {
# TODO(ehmaldonado): Remove (bugs.webrtc.org/6828)
# Errors on cyclic dependency with :video_coding if enabled.
check_includes = false
sources = [
"utility/default_video_bitrate_allocator.cc",
"utility/default_video_bitrate_allocator.h",
@ -125,13 +134,25 @@ rtc_static_library("video_coding_utility") {
}
deps = [
"../..:webrtc_common",
"../../base:rtc_analytics",
"../../base:rtc_base_approved",
"../../common_video",
"../../system_wrappers",
]
}
rtc_static_library("webrtc_h264") {
# TODO(ehmaldonado): Remove (bugs.webrtc.org/6828)
# Errors on cyclic dependency if enabled:
# //webrtc/call:call ->
# //webrtc/video:video ->
# //webrtc/modules/video_coding:video_coding ->
# //webrtc/modules/video_coding:webrtc_h264 ->
# //webrtc/media:rtc_media ->
# //webrtc/call:call
check_includes = false
sources = [
"codecs/h264/h264.cc",
"codecs/h264/include/h264.h",
@ -144,6 +165,8 @@ rtc_static_library("webrtc_h264") {
defines = []
deps = [
":video_coding_utility",
"../../base:rtc_base_approved",
"../../system_wrappers",
]
@ -179,6 +202,9 @@ rtc_static_library("webrtc_i420") {
}
deps = [
"../..:webrtc_common",
"../../base:rtc_base_approved",
"../../common_video:common_video",
"../../system_wrappers",
]
}
@ -212,6 +238,7 @@ rtc_static_library("webrtc_vp8") {
deps = [
":video_coding_utility",
"../..:webrtc_common",
"../../base:rtc_base_approved",
"../../common_video",
"../../system_wrappers",
]
@ -244,6 +271,7 @@ rtc_static_library("webrtc_vp9") {
deps = [
":video_coding_utility",
"../../base:rtc_base_approved",
"../../common_video",
"../../system_wrappers",
]
@ -273,6 +301,12 @@ if (rtc_include_tests) {
}
deps = [
":video_coding",
":video_coding_utility",
"../..:webrtc_common",
"../../base:rtc_base_approved",
"../../common_video:common_video",
"../../system_wrappers:system_wrappers",
"../../test:test_support",
]
}