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

Switch to absl single target when building with Chromium.

Browse Source 
The //third_party/abseil-cpp:absl target is currently a group that
depends on all the targets needed by WebRTC in Chromium.

It will be switched to a component starting from
https://chromium-review.googlesource.com/c/chromium/src/+/2174434.

Bug: chromium:1046390
Change-Id: I70d450fdbfa895084b481c9884b6361d2fb9580d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176901
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31498}
This commit is contained in:
Mirko Bonadei 2020-06-11 11:25:32 +02:00 committed by Commit Bot
parent 64469037b7
commit 08ce986fda
6 changed files with 602 additions and 612 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
audio/test/pc_low_bandwidth_audio_test.cc
View File

@ -11,6 +11,7 @@
#include <memory> #include <memory>
#include "absl/flags/declare.h" #include "absl/flags/declare.h"
#include "absl/flags/flag.h"
#include "api/test/create_network_emulation_manager.h" #include "api/test/create_network_emulation_manager.h"
#include "api/test/create_peerconnection_quality_test_fixture.h" #include "api/test/create_peerconnection_quality_test_fixture.h"
#include "api/test/network_emulation_manager.h" #include "api/test/network_emulation_manager.h"

2
rtc_tools/BUILD.gn
View File

@ -17,12 +17,12 @@ group("rtc_tools") {
deps = [ deps = [
":frame_analyzer", ":frame_analyzer",
":video_file_reader", ":video_file_reader",
":video_quality_analysis",
] ]
if (!build_with_chromium) { if (!build_with_chromium) {
deps += [ deps += [
":psnr_ssim_analyzer", ":psnr_ssim_analyzer",
":rgba_to_i420_converter", ":rgba_to_i420_converter",
":video_quality_analysis",
] ]
if (rtc_enable_protobuf) { if (rtc_enable_protobuf) {
deps += [ ":chart_proto" ] deps += [ ":chart_proto" ]

27
test/BUILD.gn
View File

@ -22,13 +22,13 @@ group("test") {
":test_renderer", ":test_renderer",
":test_support", ":test_support",
":video_test_common", ":video_test_common",
"pc/e2e",
] ]
if (rtc_include_tests) { if (rtc_include_tests) {
deps += [ deps += [
":test_main", ":test_main",
":test_support_unittests", ":test_support_unittests",
"pc/e2e",
] ]
} }
} }
@ -234,10 +234,7 @@ rtc_library("perf_test") {
"../rtc_base:logging", "../rtc_base:logging",
"../rtc_base:rtc_numerics", "../rtc_base:rtc_numerics",
] ]
absl_deps = [ absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
"//third_party/abseil-cpp/absl/flags:flag",
"//third_party/abseil-cpp/absl/types:optional",
]
if (rtc_enable_protobuf) { if (rtc_enable_protobuf) {
sources += [ "testsupport/perf_test_histogram_writer.cc" ] sources += [ "testsupport/perf_test_histogram_writer.cc" ]
deps += [ deps += [
@ -375,6 +372,16 @@ rtc_library("video_test_support") {
} }
if (rtc_include_tests) { if (rtc_include_tests) {
rtc_library("resources_dir_flag") {
testonly = true
visibility = [ "*" ]
sources = [
"testsupport/resources_dir_flag.cc",
"testsupport/resources_dir_flag.h",
]
absl_deps = [ "//third_party/abseil-cpp/absl/flags:flag" ]
}
rtc_library("test_main_lib") { rtc_library("test_main_lib") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
@ -611,16 +618,6 @@ rtc_library("fileutils") {
} }
} }
rtc_library("resources_dir_flag") {
testonly = true
visibility = [ "*" ]
sources = [
"testsupport/resources_dir_flag.cc",
"testsupport/resources_dir_flag.h",
]
absl_deps = [ "//third_party/abseil-cpp/absl/flags:flag" ]
}
# We separate header into own target to make it possible for downstream # We separate header into own target to make it possible for downstream
# projects to override implementation. # projects to override implementation.
rtc_source_set("fileutils_override_api") { rtc_source_set("fileutils_override_api") {

76
test/pc/e2e/BUILD.gn
View File

@ -8,7 +8,8 @@
import("../../../webrtc.gni") import("../../../webrtc.gni")
group("e2e") { if (!build_with_chromium) {
group("e2e") {
testonly = true testonly = true
deps = [ deps = [
@ -27,9 +28,9 @@ group("e2e") {
":video_quality_analyzer_injection_helper", ":video_quality_analyzer_injection_helper",
] ]
} }
} }
if (rtc_include_tests) { if (rtc_include_tests) {
group("e2e_unittests") { group("e2e_unittests") {
testonly = true testonly = true
@ -41,9 +42,9 @@ if (rtc_include_tests) {
":single_process_encoded_image_data_injector_unittest", ":single_process_encoded_image_data_injector_unittest",
] ]
} }
} }
rtc_library("peer_connection_quality_test_params") { rtc_library("peer_connection_quality_test_params") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
sources = [ "peer_connection_quality_test_params.h" ] sources = [ "peer_connection_quality_test_params.h" ]
@ -61,17 +62,17 @@ rtc_library("peer_connection_quality_test_params") {
"../../../api/video_codecs:video_codecs_api", "../../../api/video_codecs:video_codecs_api",
"../../../rtc_base", "../../../rtc_base",
] ]
} }
rtc_library("encoded_image_data_injector_api") { rtc_library("encoded_image_data_injector_api") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
sources = [ "analyzer/video/encoded_image_data_injector.h" ] sources = [ "analyzer/video/encoded_image_data_injector.h" ]
deps = [ "../../../api/video:encoded_image" ] deps = [ "../../../api/video:encoded_image" ]
} }
rtc_library("default_encoded_image_data_injector") { rtc_library("default_encoded_image_data_injector") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
sources = [ sources = [
@ -86,9 +87,9 @@ rtc_library("default_encoded_image_data_injector") {
"../../../rtc_base:criticalsection", "../../../rtc_base:criticalsection",
] ]
absl_deps = [ "//third_party/abseil-cpp/absl/memory" ] absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]
} }
rtc_library("single_process_encoded_image_data_injector") { rtc_library("single_process_encoded_image_data_injector") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
sources = [ sources = [
@ -103,9 +104,9 @@ rtc_library("single_process_encoded_image_data_injector") {
"../../../rtc_base:criticalsection", "../../../rtc_base:criticalsection",
] ]
absl_deps = [ "//third_party/abseil-cpp/absl/memory" ] absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]
} }
rtc_library("id_generator") { rtc_library("id_generator") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
sources = [ sources = [
@ -113,9 +114,9 @@ rtc_library("id_generator") {
"analyzer/video/id_generator.h", "analyzer/video/id_generator.h",
] ]
deps = [] deps = []
} }
rtc_library("simulcast_dummy_buffer_helper") { rtc_library("simulcast_dummy_buffer_helper") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
sources = [ sources = [
@ -126,9 +127,9 @@ rtc_library("simulcast_dummy_buffer_helper") {
"../../../api/video:video_frame", "../../../api/video:video_frame",
"../../../api/video:video_frame_i420", "../../../api/video:video_frame_i420",
] ]
} }
rtc_library("quality_analyzing_video_decoder") { rtc_library("quality_analyzing_video_decoder") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
sources = [ sources = [
@ -153,9 +154,9 @@ rtc_library("quality_analyzing_video_decoder") {
"//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]
} }
rtc_library("quality_analyzing_video_encoder") { rtc_library("quality_analyzing_video_encoder") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
sources = [ sources = [
@ -175,9 +176,9 @@ rtc_library("quality_analyzing_video_encoder") {
"../../../rtc_base:logging", "../../../rtc_base:logging",
] ]
absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
} }
if (rtc_include_tests) { if (rtc_include_tests) {
rtc_library("video_quality_analyzer_injection_helper") { rtc_library("video_quality_analyzer_injection_helper") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
@ -524,9 +525,9 @@ if (rtc_include_tests) {
] ]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
} }
} }
rtc_library("analyzer_helper") { rtc_library("analyzer_helper") {
visibility = [ "*" ] visibility = [ "*" ]
sources = [ sources = [
"analyzer_helper.cc", "analyzer_helper.cc",
@ -537,9 +538,9 @@ rtc_library("analyzer_helper") {
"../../../rtc_base:macromagic", "../../../rtc_base:macromagic",
"../../../rtc_base/synchronization:sequence_checker", "../../../rtc_base/synchronization:sequence_checker",
] ]
} }
rtc_library("default_audio_quality_analyzer") { rtc_library("default_audio_quality_analyzer") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
sources = [ sources = [
@ -557,9 +558,9 @@ rtc_library("default_audio_quality_analyzer") {
"../../../rtc_base:logging", "../../../rtc_base:logging",
"../../../rtc_base:rtc_numerics", "../../../rtc_base:rtc_numerics",
] ]
} }
rtc_library("example_video_quality_analyzer") { rtc_library("example_video_quality_analyzer") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
sources = [ sources = [
@ -576,9 +577,9 @@ rtc_library("example_video_quality_analyzer") {
"../../../rtc_base:criticalsection", "../../../rtc_base:criticalsection",
"../../../rtc_base:logging", "../../../rtc_base:logging",
] ]
} }
rtc_library("video_quality_metrics_reporter") { rtc_library("video_quality_metrics_reporter") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
@ -592,9 +593,9 @@ rtc_library("video_quality_metrics_reporter") {
"../../../rtc_base:criticalsection", "../../../rtc_base:criticalsection",
"../../../rtc_base:rtc_numerics", "../../../rtc_base:rtc_numerics",
] ]
} }
rtc_library("default_video_quality_analyzer") { rtc_library("default_video_quality_analyzer") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
@ -623,9 +624,9 @@ rtc_library("default_video_quality_analyzer") {
"../../../rtc_base:timeutils", "../../../rtc_base:timeutils",
"../../../system_wrappers", "../../../system_wrappers",
] ]
} }
rtc_library("network_quality_metrics_reporter") { rtc_library("network_quality_metrics_reporter") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
sources = [ sources = [
@ -641,9 +642,9 @@ rtc_library("network_quality_metrics_reporter") {
"../../../rtc_base:rtc_event", "../../../rtc_base:rtc_event",
"../../../system_wrappers:field_trial", "../../../system_wrappers:field_trial",
] ]
} }
rtc_library("sdp_changer") { rtc_library("sdp_changer") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
sources = [ sources = [
@ -666,12 +667,13 @@ rtc_library("sdp_changer") {
"//third_party/abseil-cpp/absl/strings:strings", "//third_party/abseil-cpp/absl/strings:strings",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]
} }
rtc_library("multi_head_queue") { rtc_library("multi_head_queue") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true testonly = true
sources = [ "analyzer/video/multi_head_queue.h" ] sources = [ "analyzer/video/multi_head_queue.h" ]
deps = [ "../../../rtc_base:checks" ] deps = [ "../../../rtc_base:checks" ]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
} }

1
test/testsupport/perf_test.h
View File

@ -15,7 +15,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "absl/flags/flag.h"
#include "api/array_view.h" #include "api/array_view.h"
#include "rtc_base/numerics/samples_stats_counter.h" #include "rtc_base/numerics/samples_stats_counter.h"

21
webrtc.gni
View File

@ -539,11 +539,8 @@ template("rtc_source_set") {
if (!defined(deps)) { if (!defined(deps)) {
deps = [] deps = []
} }
if (is_component_build && build_with_chromium) { if (build_with_chromium) {
# TODO(crbug.com/1046390): Enable when the Abseil component will be deps += [ "//third_party/abseil-cpp:absl" ]
# available.
# deps += [ "//third_party/abseil-cpp:absl" ]
deps += absl_deps # Remove when the line above is enabled.
} else { } else {
deps += absl_deps deps += absl_deps
} }
@ -631,11 +628,8 @@ template("rtc_static_library") {
if (!defined(deps)) { if (!defined(deps)) {
deps = [] deps = []
} }
if (is_component_build && build_with_chromium) { if (build_with_chromium) {
# TODO(crbug.com/1046390): Enable when the Abseil component will be deps += [ "//third_party/abseil-cpp:absl" ]
# available.
# deps += [ "//third_party/abseil-cpp:absl" ]
deps += absl_deps # Remove when the line above is enabled.
} else { } else {
deps += absl_deps deps += absl_deps
} }
@ -760,11 +754,8 @@ template("rtc_library") {
if (!defined(deps)) { if (!defined(deps)) {
deps = [] deps = []
} }
if (is_component_build && build_with_chromium) { if (build_with_chromium) {
# TODO(crbug.com/1046390): Enable when the Abseil component will be deps += [ "//third_party/abseil-cpp:absl" ]
# available.
# deps += [ "//third_party/abseil-cpp:absl" ]
deps += absl_deps # Remove when the line above is enabled.
} else { } else {
deps += absl_deps deps += absl_deps
} }