admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing $rtc_libyuv_dir and removing useless dependencies on libyuv.

Browse Source 
This CL removes the following GN variables: rtc_build_libyuv,
rtc_libyuv_dir (as requested in webrtc:7906).
It also removes some unneeded dependencies on //third_party/libyuv.

WebRTC targets were using public_deps to depend on //third_party/libyuv
and this created a build graph where targets that were depending on
//third_party/libyuv were not declaring the dependency to GN because
they were somehow getting it from another target that was exposing
//third_party/libyuv header files even if it wasn't directly depending
on it.

Bug: webrtc:8605, webrtc:7906
Change-Id: If71f7988fd80421dc2ad887cf94c2ac66366c3fb
Reviewed-on: https://webrtc-review.googlesource.com/32201
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21275}
This commit is contained in:
Mirko Bonadei 2017-12-14 11:24:00 +01:00 committed by Commit Bot
parent d5cae4d59c
commit 401d056891
11 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/BUILD.gn
View File

@ -234,10 +234,10 @@ rtc_source_set("video_frame_api_i420") {
]
deps = [
":video_frame_api",
"$rtc_libyuv_dir",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
"//third_party/libyuv",
]
}

3
common_video/BUILD.gn
View File

@ -60,7 +60,6 @@ rtc_static_library("common_video") {
}
deps = [
"$rtc_libyuv_dir",
"..:webrtc_common",
"../api:optional",
"../api:video_frame_api_i420",
@ -113,7 +112,6 @@ if (rtc_include_tests) {
deps = [
":common_video",
"$rtc_libyuv_dir",
"../api:video_frame_api_i420",
"../modules/video_capture:video_capture",
"../rtc_base:rtc_base",
@ -123,6 +121,7 @@ if (rtc_include_tests) {
"../test:video_test_common",
"//testing/gmock",
"//testing/gtest",
"//third_party/libyuv",
]
data = common_video_resources

4
media/BUILD.gn
View File

@ -102,7 +102,6 @@ rtc_static_library("rtc_media_base") {
}
deps += [
"$rtc_libyuv_dir",
"..:webrtc_common",
"../api:libjingle_peerconnection_api",
"../api:optional",
@ -136,6 +135,7 @@ rtc_static_library("rtc_audio_video") {
"../rtc_base:checks",
"../system_wrappers:field_trial_api",
"../system_wrappers:metrics_api",
"//third_party/libyuv",
]
sources = [
"engine/adm_helpers.cc",
@ -229,7 +229,6 @@ rtc_static_library("rtc_audio_video") {
}
deps += [
":rtc_media_base",
"$rtc_libyuv_dir",
"..:webrtc_common",
"../api:call_api",
"../api:libjingle_peerconnection_api",
@ -378,7 +377,6 @@ if (rtc_include_tests) {
deps += [
":rtc_media",
":rtc_media_base",
"$rtc_libyuv_dir",
"..:webrtc_common",
"../api:call_api",
"../api:video_frame_api",

2
modules/video_capture/BUILD.gn
View File

@ -26,7 +26,6 @@ rtc_static_library("video_capture_module") {
]
deps = [
"$rtc_libyuv_dir",
"..:module_api",
"../..:webrtc_common",
"../../api:video_frame_api_i420",
@ -34,6 +33,7 @@ rtc_static_library("video_capture_module") {
"../../media:rtc_media_base",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"//third_party/libyuv",
]
if (!build_with_chromium && is_clang) {

4
modules/video_coding/BUILD.gn
View File

@ -238,13 +238,13 @@ rtc_static_library("webrtc_i420") {
deps = [
":video_coding_utility",
"$rtc_libyuv_dir",
"../..:webrtc_common",
"../../api:video_frame_api_i420",
"../../common_video:common_video",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"//third_party/libyuv",
]
}
@ -299,7 +299,6 @@ rtc_static_library("webrtc_vp8") {
deps = [
":video_coding_utility",
"$rtc_libyuv_dir",
"..:module_api",
"../..:webrtc_common",
"../../api:optional",
@ -312,6 +311,7 @@ rtc_static_library("webrtc_vp8") {
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../system_wrappers:metrics_api",
"//third_party/libyuv",
]
if (rtc_build_libvpx) {
deps += [ rtc_libvpx_dir ]

2
modules/video_processing/BUILD.gn
View File

@ -26,7 +26,6 @@ rtc_static_library("video_processing") {
deps = [
":denoiser_filter",
"$rtc_libyuv_dir",
"..:module_api",
"../../common_audio",
"../../common_video",
@ -34,6 +33,7 @@ rtc_static_library("video_processing") {
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:cpu_features_api",
"//third_party/libyuv",
]
if (build_video_processing_sse2) {
deps += [ ":video_processing_sse2" ]

9
rtc_tools/BUILD.gn
View File

@ -65,8 +65,6 @@ rtc_static_library("video_quality_analysis") {
"frame_analyzer/video_quality_analysis.h",
]
deps = [
"$rtc_libyuv_dir",
# TODO(bugs.webrtc.org/6828): api:optional should be a dependency
# of rtc_base:rtc_base_approved_generic but that causes a circular
# dependency. In order to fix the chromium build on MSVC64 (dbg)
@ -74,6 +72,7 @@ rtc_static_library("video_quality_analysis") {
# symbols it needs.
"../api:optional",
"../common_video",
"//third_party/libyuv",
]
}
@ -85,7 +84,6 @@ rtc_executable("frame_analyzer") {
deps = [
":command_line_parser",
":video_quality_analysis",
"$rtc_libyuv_dir",
"//build/win:default_exe_manifest",
]
}
@ -101,7 +99,6 @@ if (!build_with_chromium) {
deps = [
":command_line_parser",
":video_quality_analysis",
"$rtc_libyuv_dir",
"//build/win:default_exe_manifest",
]
}
@ -114,7 +111,6 @@ if (!build_with_chromium) {
deps = [
":video_quality_analysis",
"$rtc_libyuv_dir",
]
}
@ -139,9 +135,9 @@ if (!build_with_chromium) {
deps = [
":command_line_parser",
"$rtc_libyuv_dir",
"../common_video",
"//build/win:default_exe_manifest",
"//third_party/libyuv",
]
}
@ -338,7 +334,6 @@ if (rtc_include_tests) {
":frame_editing_lib",
":reference_less_video_analysis_lib",
":video_quality_analysis",
"$rtc_libyuv_dir",
"../common_video:common_video",
"../rtc_base",
"../rtc_base:checks",

7
sdk/BUILD.gn
View File

@ -134,7 +134,6 @@ if (is_ios || is_mac) {
deps = [
":common_objc",
"$rtc_libyuv_dir",
"../api:libjingle_peerconnection_api",
"../api:video_frame_api",
"../api:video_frame_api_i420",
@ -142,6 +141,7 @@ if (is_ios || is_mac) {
"../media:rtc_media_base",
"../rtc_base:checks",
"../rtc_base:rtc_base",
"//third_party/libyuv",
]
configs += [ "..:common_objc" ]
@ -305,7 +305,6 @@ if (is_ios || is_mac) {
":corevideoframebuffer_objc",
":peerconnectionfactory_objc",
":video_objc",
"$rtc_libyuv_dir",
"../api:video_frame_api",
"../media:rtc_media_base",
"../pc:libjingle_peerconnection",
@ -773,11 +772,11 @@ if (is_ios || is_mac) {
]
deps = [
"$rtc_libyuv_dir",
"../api:video_frame_api_i420",
"../common_video",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"//third_party/libyuv",
]
if (!build_with_chromium && is_clang) {
@ -829,7 +828,6 @@ if (is_ios || is_mac) {
":video_objc",
":video_toolbox_cc",
":videotracksource_objc",
"$rtc_libyuv_dir",
"../api/video_codecs:video_codecs_api",
"../common_video",
"../media:rtc_media",
@ -840,6 +838,7 @@ if (is_ios || is_mac) {
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
"//third_party/libyuv",
]
libs = [

2
sdk/android/BUILD.gn
View File

@ -218,7 +218,6 @@ rtc_static_library("video_jni") {
":base_jni",
":generated_video_jni",
":peerconnection_jni",
"$rtc_libyuv_dir",
"../..:webrtc_common",
"../../api:libjingle_peerconnection_api",
"../../api:video_frame_api",
@ -240,6 +239,7 @@ rtc_static_library("video_jni") {
"../../rtc_base:weak_ptr",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"//third_party/libyuv",
]
}

2
test/BUILD.gn
View File

@ -227,7 +227,6 @@ if (rtc_include_tests) {
deps = [
":test_support",
":video_test_common",
"$rtc_libyuv_dir",
"..:webrtc_common",
"../api:video_frame_api",
"../api:video_frame_api_i420",
@ -237,6 +236,7 @@ if (rtc_include_tests) {
"../system_wrappers",
"//testing/gmock",
"//testing/gtest",
"//third_party/libyuv",
]
if (!is_ios) {

2
webrtc.gni
View File

@ -88,7 +88,6 @@ declare_args() {
rtc_build_libsrtp = true
rtc_build_libvpx = true
rtc_libvpx_build_vp9 = true
rtc_build_libyuv = true
rtc_build_openmax_dl = true
rtc_build_opus = true
rtc_build_ssl = true
@ -198,7 +197,6 @@ declare_args() {
# Make it possible to provide custom locations for some libraries (move these
# up into declare_args should we need to actually use them for the GN build).
rtc_libvpx_dir = "//third_party/libvpx"
rtc_libyuv_dir = "//third_party/libyuv"
rtc_opus_dir = "//third_party/opus"
# Desktop capturer is supported only on Windows, OSX and Linux.