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/api/BUILD.gn b/api/BUILD.gn
index 579f883..7e74c1a 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -597,7 +597,7 @@
deps = [
":libjingle_peerconnection_api",
"../rtc_base:checks",
- "../third_party/abseil-cpp/absl/memory:memory",
+ "//third_party/abseil-cpp/absl/memory:memory",
]
}
diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index d569d27..b44bbe5 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -278,7 +278,7 @@
"../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",
]
diff --git a/call/BUILD.gn b/call/BUILD.gn
index 3e01381..6d2ea82 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -442,7 +442,7 @@
]
deps = [
":bitrate_allocator",
- "//test:test_support",
+ "../test:test_support",
]
}
rtc_source_set("mock_call_interfaces") {
@@ -453,7 +453,7 @@
]
deps = [
":call_interfaces",
- "//test:test_support",
+ "../test:test_support",
]
}
@@ -470,7 +470,7 @@
"../system_wrappers",
"../test:test_common",
"../test:test_main",
- "//test:test_support",
+ "../test:test_support",
"//testing/gtest",
]
}
diff --git a/common_audio/BUILD.gn b/common_audio/BUILD.gn
index 51cb1b0..267037d 100644
--- a/common_audio/BUILD.gn
+++ b/common_audio/BUILD.gn
@@ -389,7 +389,7 @@
"../system_wrappers:cpu_features_api",
"../test:fileutils",
"../test:test_main",
- "//test:test_support",
+ "../test:test_support",
"//testing/gtest",
]
diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn
index 6ac40b4..125bcfc 100644
--- a/common_video/BUILD.gn
+++ b/common_video/BUILD.gn
@@ -95,8 +95,8 @@
"../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",
]
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index f36e4f0..455dcd0 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -1500,7 +1500,7 @@
"../../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 @@
"../../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 @@
"../../rtc_base:rtc_base_approved",
"../../test:fileutils",
"../../test:test_main",
- "//test:test_support",
+ "../../test:test_support",
"//testing/gtest",
]
}
diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index 3089016..f21c6d8 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -228,7 +228,7 @@
"../../rtc_base:rtc_base_approved",
"../../test:fileutils",
"../../test:test_main",
- "//test:test_support",
+ "../../test:test_support",
"//testing/gtest",
]
data = [
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 393fb3f..9bef2ee 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -330,7 +330,7 @@
":rtp_rtcp",
"../../test:fileutils",
"../../test:test_main",
- "//test:test_support",
+ "../../test:test_support",
"//testing/gtest",
]
} # test_packet_masks_metrics
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
index 734fcbf..6ec38fe 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -190,9 +190,9 @@
"../../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" ]
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" ]
}
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index ff731ba..f703918 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -1190,7 +1190,7 @@
"../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",
]
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 8a3f8cc..c513a66 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -1386,23 +1386,23 @@
":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",
]
}
diff --git a/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn
index b3e09f8..143a347 100644
--- a/system_wrappers/BUILD.gn
+++ b/system_wrappers/BUILD.gn
@@ -179,7 +179,7 @@
"..:webrtc_common",
"../rtc_base:rtc_base_approved",
"../test:test_main",
- "//test:test_support",
+ "../test:test_support",
"//testing/gtest",
]
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 29d5774..c7218b6 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -211,8 +211,8 @@
"../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
diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn
index 3e61af3..f3746b8 100644
--- a/test/scenario/BUILD.gn
+++ b/test/scenario/BUILD.gn
@@ -118,9 +118,9 @@
"../../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",
]