Harmonize paths to dependent targets.
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}
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 3d9804c..6f60ab1 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -36,8 +36,10 @@
":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 (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 @@
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 @@
"../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" ]
}