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

Harmonize paths to dependent targets.

Browse Source 
This CL consistently use:
 * relative paths for WebRTC dependent targets (test_support)
 * absolute paths for shared dependent targets (abseil)
This is a necessary (but insufficient) step to build WebRTC tests
from Chromium tree (rtc_include_tests=true), since test/ doesn't
sit anymore in the top level directory.

We also make sure that target declarations and uses are
consistent in regard to build_with_chromium flag.

Bug: webrtc:9943
Bug: webrtc:9855
Change-Id: I21dea98894df2fd4bfe2fd7ee7b71ba971e0ab5b
Reviewed-on: https://webrtc-review.googlesource.com/c/108720
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Yves Gerey <yvesg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25445}
This commit is contained in:
Yves Gerey 2018-10-30 21:12:42 +01:00 committed by Commit Bot
parent b32bb959c9
commit 21cddffd99
15 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/BUILD.gn
View File

@ -597,7 +597,7 @@ if (rtc_include_tests) {
deps = [
":libjingle_peerconnection_api",
"../rtc_base:checks",
"../third_party/abseil-cpp/absl/memory:memory",
"//third_party/abseil-cpp/absl/memory:memory",
]
}

2
audio/BUILD.gn
View File

@ -278,7 +278,7 @@ if (rtc_include_tests) {
"../test:single_threaded_task_queue",
"../test:test_common",
"../test:test_main",
"//test:test_support",
"../test:test_support",
"//testing/gtest",
"//third_party/abseil-cpp/absl/memory",
]

6
call/BUILD.gn
View File

@ -442,7 +442,7 @@ if (rtc_include_tests) {
]
deps = [
":bitrate_allocator",
"//test:test_support",
"../test:test_support",
]
}
rtc_source_set("mock_call_interfaces") {
@ -453,7 +453,7 @@ if (rtc_include_tests) {
]
deps = [
":call_interfaces",
"//test:test_support",
"../test:test_support",
]
}
@ -470,7 +470,7 @@ if (rtc_include_tests) {
"../system_wrappers",
"../test:test_common",
"../test:test_main",
"//test:test_support",
"../test:test_support",
"//testing/gtest",
]
}

2
common_audio/BUILD.gn
View File

@ -389,7 +389,7 @@ if (rtc_include_tests) {
"../system_wrappers:cpu_features_api",
"../test:fileutils",
"../test:test_main",
"//test:test_support",
"../test:test_support",
"//testing/gtest",
]

2
common_video/BUILD.gn
View File

@ -95,8 +95,8 @@ if (rtc_include_tests) {
"../rtc_base:rtc_base_tests_utils",
"../test:fileutils",
"../test:test_main",
"../test:test_support",
"../test:video_test_common",
"//test:test_support",
"//testing/gtest",
"//third_party/libyuv",
]

6
modules/audio_coding/BUILD.gn
View File

@ -1500,7 +1500,7 @@ if (rtc_include_tests) {
"../../rtc_base/system:arch",
"../../test:test_main",
"//testing/gtest",
"//test:test_support",
"../../test:test_support",
] + audio_coding_deps
data = audio_decoder_unittests_resources
@ -1618,8 +1618,8 @@ if (rtc_include_tests) {
"../../api:libjingle_peerconnection_api",
"../../rtc_base:rtc_base_approved",
"../../test:test_main",
"../../test:test_support",
"../audio_processing",
"//test:test_support",
"//testing/gtest",
]
}
@ -1980,7 +1980,7 @@ if (rtc_include_tests) {
"../../rtc_base:rtc_base_approved",
"../../test:fileutils",
"../../test:test_main",
"//test:test_support",
"../../test:test_support",
"//testing/gtest",
]
}

2
modules/remote_bitrate_estimator/BUILD.gn
View File

@ -228,7 +228,7 @@ if (rtc_include_tests) {
"../../rtc_base:rtc_base_approved",
"../../test:fileutils",
"../../test:test_main",
"//test:test_support",
"../../test:test_support",
"//testing/gtest",
]
data = [

2
modules/rtp_rtcp/BUILD.gn
View File

@ -330,7 +330,7 @@ if (rtc_include_tests) {
":rtp_rtcp",
"../../test:fileutils",
"../../test:test_main",
"//test:test_support",
"../../test:test_support",
"//testing/gtest",
]
} # test_packet_masks_metrics

2
modules/video_capture/BUILD.gn
View File

@ -190,9 +190,9 @@ if (!build_with_chromium) {
"../../common_video:common_video",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers",
"../../test:test_support",
"../../test:video_test_common",
"../utility",
"//test:test_support",
"//testing/gtest",
]
deps += [ "../../test:test_main" ]

17
rtc_tools/BUILD.gn
View File

@ -36,8 +36,10 @@ group("rtc_tools") {
":tools_unittests",
]
if (rtc_enable_protobuf) {
if (!build_with_chromium) {
deps += [ ":event_log_visualizer" ]
}
deps += [
":event_log_visualizer",
":rtp_analyzer",
":unpack_aecdump",
"network_tester",
@ -275,7 +277,7 @@ if (!build_with_chromium) {
}
if (rtc_include_tests) {
if (rtc_enable_protobuf) {
if (rtc_enable_protobuf && !build_with_chromium) {
rtc_executable("event_log_visualizer") {
testonly = true
sources = [
@ -357,8 +359,6 @@ if (rtc_include_tests) {
deps = [
":command_line_parser",
":frame_editing_lib",
":reference_less_video_analysis_lib",
":video_file_reader",
":video_file_writer",
":video_quality_analysis",
@ -367,12 +367,19 @@ if (rtc_include_tests) {
"../rtc_base:checks",
"../test:fileutils",
"../test:test_main",
"//test:test_support",
"../test:test_support",
"//testing/gtest",
"//third_party/abseil-cpp/absl/memory",
"//third_party/libyuv",
]
if (!build_with_chromium) {
deps += [
":frame_editing_lib",
":reference_less_video_analysis_lib",
]
}
if (rtc_enable_protobuf) {
deps += [ "network_tester:network_tester_unittests" ]
}

2
sdk/BUILD.gn
View File

@ -1190,7 +1190,7 @@ if (is_ios || is_mac) {
"../modules/video_coding:video_codec_interface",
"../rtc_base:rtc_base_tests_utils",
"../rtc_base/system:unused",
"//test:test_support",
"../test:test_support",
"//third_party/ocmock",
]

32
sdk/android/BUILD.gn
View File

@ -1386,23 +1386,23 @@ if (is_android) {
":native_api_video",
":opensles_audio_device_module",
":video_jni",
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../api/audio_codecs:builtin_audio_encoder_factory",
"../../api/video:video_frame",
"../../media:rtc_audio_video",
"../../media:rtc_internal_video_codecs",
"../../media:rtc_media_base",
"../../modules/audio_device:audio_device",
"../../modules/audio_device:mock_audio_device",
"../../modules/audio_processing:audio_processing",
"../../modules/utility:utility",
"../../pc:libjingle_peerconnection",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers",
"//api/audio_codecs:builtin_audio_decoder_factory",
"//api/audio_codecs:builtin_audio_encoder_factory",
"//api/video:video_frame",
"//media:rtc_audio_video",
"//media:rtc_internal_video_codecs",
"//media:rtc_media_base",
"//modules/audio_device:audio_device",
"//modules/audio_device:mock_audio_device",
"//modules/audio_processing:audio_processing",
"//modules/utility:utility",
"//pc:libjingle_peerconnection",
"//rtc_base:checks",
"//rtc_base:rtc_base_approved",
"//test:fileutils",
"//test:test_support",
"//testing/gtest",
"../../test:fileutils",
"../../test:test_support",
"../../testing/gtest",
"//third_party/abseil-cpp/absl/memory",
]
}

2
system_wrappers/BUILD.gn
View File

@ -179,7 +179,7 @@ if (rtc_include_tests) {
"..:webrtc_common",
"../rtc_base:rtc_base_approved",
"../test:test_main",
"//test:test_support",
"../test:test_support",
"//testing/gtest",
]

2
test/BUILD.gn
View File

@ -211,8 +211,8 @@ if (rtc_include_tests) {
"../rtc_base:rtc_base",
"../system_wrappers:field_trial",
"../system_wrappers:metrics",
"../third_party/abseil-cpp/absl/memory:memory",
"//testing/gtest",
"//third_party/abseil-cpp/absl/memory:memory",
# TODO(bugs.webrtc.org/9792): This is needed for downstream projects on
# Android, where it's replaced by an internal version of fileutils that

2
test/scenario/BUILD.gn
View File

@ -118,9 +118,9 @@ if (rtc_include_tests) {
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_base_tests_utils",
"../../system_wrappers",
"../../system_wrappers:field_trial",
"../../test:field_trial",
"../../test:test_support",
"//system_wrappers:field_trial",
"//testing/gmock",
"//third_party/abseil-cpp/absl/memory",
]