Cleanup BUILD.gn files from imports like foo:foo
Repalce all occurrences of foo:foo in deps with just foo in BUILD.gn
files.
Done with Sublime regex replace.
Find: \b([-a-zA-Z0-9_]+):+\1\b
In: *.gn
Replace with: \1
Bug: None
Change-Id: I40aba1b14face687a595b852ffe443cb20197611
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127899
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27225}diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 255dc43..252ec9d 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -130,8 +130,8 @@
]
deps = [
+ "../rtc_base",
"../rtc_base:checks",
- "../rtc_base:rtc_base",
]
configs += [
"..:common_objc",
@@ -189,9 +189,9 @@
deps = [
":base_objc",
+ "../rtc_base",
"../rtc_base:checks",
"../rtc_base:logging",
- "../rtc_base:rtc_base",
]
configs += [
@@ -208,9 +208,9 @@
deps = [
":base_objc",
+ "../rtc_base",
"../rtc_base:checks",
"../rtc_base:logging",
- "../rtc_base:rtc_base",
]
configs += [
@@ -248,7 +248,7 @@
]
deps = [
- "../rtc_base:rtc_base",
+ "../rtc_base",
]
}
@@ -274,8 +274,8 @@
"../modules/audio_device:audio_device_api",
"../modules/audio_device:audio_device_buffer",
"../modules/audio_device:audio_device_generic",
+ "../rtc_base",
"../rtc_base:checks",
- "../rtc_base:rtc_base",
"../rtc_base/system:fallthrough",
"../system_wrappers:metrics",
]
@@ -307,8 +307,8 @@
":audio_session_observer",
":base_objc",
":helpers_objc",
+ "../rtc_base",
"../rtc_base:checks",
- "../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
]
}
@@ -331,8 +331,8 @@
"../api/video:video_frame_i420",
"../common_video",
"../media:rtc_media_base",
+ "../rtc_base",
"../rtc_base:checks",
- "../rtc_base:rtc_base",
"//third_party/libyuv",
]
@@ -412,8 +412,8 @@
"../api/video:video_frame",
"../common_video",
"../media:rtc_media_base",
+ "../rtc_base",
"../rtc_base:checks",
- "../rtc_base:rtc_base",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -665,7 +665,7 @@
":native_video",
":peerconnectionfactory_base_objc",
"../api:libjingle_peerconnection_api",
- "../rtc_base:rtc_base",
+ "../rtc_base",
]
}
@@ -763,7 +763,7 @@
"../api/video_codecs:video_codecs_api",
"../modules:module_api",
"../modules/video_coding:video_codec_interface",
- "../rtc_base:rtc_base",
+ "../rtc_base",
]
}
@@ -916,12 +916,12 @@
"../media:rtc_media_base",
"../modules:module_api",
"../modules/audio_device:audio_device_api",
+ "../modules/audio_processing",
"../modules/audio_processing:api",
- "../modules/audio_processing:audio_processing",
"../modules/video_coding:video_codec_interface",
"../pc:peerconnection",
+ "../rtc_base",
"../rtc_base:checks",
- "../rtc_base:rtc_base",
"../system_wrappers:field_trial",
"../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/memory",
@@ -1067,13 +1067,13 @@
":videotoolbox_objc",
"../api:scoped_refptr",
"../api/video:video_frame_i420",
- "../common_video:common_video",
+ "../common_video",
"../media:rtc_media_base",
"../media:rtc_media_tests_utils",
"../modules:module_api",
+ "../rtc_base",
"../rtc_base:gunit_helpers",
- "../rtc_base:rtc_base",
- "../system_wrappers:system_wrappers",
+ "../system_wrappers",
"//third_party/libyuv",
]
@@ -1188,8 +1188,8 @@
"../media:rtc_media_base",
"../modules:module_api",
"../modules/audio_device:audio_device_api",
+ "../modules/audio_processing",
"../modules/audio_processing:api",
- "../modules/audio_processing:audio_processing",
"../modules/video_coding:video_codec_interface",
"../rtc_base:gunit_helpers",
"../rtc_base/system:unused",
@@ -1548,7 +1548,7 @@
"../api/video:video_frame",
"../api/video_codecs:video_codecs_api",
"../common_video",
- "../rtc_base:rtc_base",
+ "../rtc_base",
"//third_party/abseil-cpp/absl/memory",
]
}
@@ -1589,8 +1589,8 @@
"../media:rtc_media_base",
"../modules:module_api",
"../modules/video_coding:video_codec_interface",
+ "../rtc_base",
"../rtc_base:checks",
- "../rtc_base:rtc_base",
"//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 06eef3a..8c49bbe 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -152,7 +152,7 @@
":libjingle_peerconnection_jni",
":libjingle_peerconnection_metrics_default_jni",
"../../pc:libjingle_peerconnection",
- "../../rtc_base:rtc_base",
+ "../../rtc_base",
]
output_extension = "so"
}
@@ -176,7 +176,7 @@
":null_video_jni",
":peerconnection_jni",
"../../pc:peerconnection",
- "../../rtc_base:rtc_base",
+ "../../rtc_base",
"../../rtc_base:rtc_base_approved",
]
output_extension = "so"
@@ -564,8 +564,8 @@
":native_api_jni",
"../../api:libjingle_peerconnection_api",
"../../api:scoped_refptr",
+ "../../rtc_base",
"../../rtc_base:checks",
- "../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/memory",
@@ -583,8 +583,8 @@
":builtin_audio_codecs_jni",
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../api/audio_codecs:builtin_audio_encoder_factory",
+ "../../modules/audio_processing",
"../../modules/audio_processing:api",
- "../../modules/audio_processing:audio_processing",
"../../rtc_base:rtc_base_approved",
]
}
@@ -625,13 +625,13 @@
"../../api:scoped_refptr",
"../../api/task_queue",
"../../api/video_codecs:video_codecs_api",
- "../../common_video:common_video",
+ "../../common_video",
"../../media:rtc_internal_video_codecs",
"../../media:rtc_media_base",
"../../modules/video_coding:video_codec_interface",
"../../modules/video_coding:video_coding_utility",
+ "../../rtc_base",
"../../rtc_base:checks",
- "../../rtc_base:rtc_base",
"../../rtc_base:rtc_task_queue",
"../../rtc_base:sequenced_task_checker",
"../../rtc_base:weak_ptr",
@@ -688,13 +688,13 @@
"../../api/video:video_frame",
"../../api/video_codecs:rtc_software_fallback_wrappers",
"../../api/video_codecs:video_codecs_api",
- "../../common_video:common_video",
+ "../../common_video",
"../../media:rtc_media_base",
"../../modules/video_coding:codec_globals_headers",
"../../modules/video_coding:video_codec_interface",
"../../modules/video_coding:video_coding_utility",
+ "../../rtc_base",
"../../rtc_base:checks",
- "../../rtc_base:rtc_base",
"../../rtc_base:rtc_task_queue",
"../../rtc_base/task_utils:to_queued_task",
"//third_party/libyuv",
@@ -771,11 +771,11 @@
"../../logging:rtc_event_log_impl_base",
"../../media:rtc_data",
"../../media:rtc_media_base",
- "../../modules/audio_device:audio_device",
- "../../modules/utility:utility",
+ "../../modules/audio_device",
+ "../../modules/utility",
"../../pc:peerconnection",
+ "../../rtc_base",
"../../rtc_base:checks",
- "../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../rtc_base/system:thread_registry",
@@ -892,8 +892,8 @@
deps = [
":base_jni",
":native_api_jni",
+ "//rtc_base",
"//rtc_base:checks",
- "//rtc_base:rtc_base",
"//third_party/abseil-cpp/absl/memory",
]
}
@@ -912,7 +912,7 @@
":base_jni",
":java_audio_device_module",
":opensles_audio_device_module",
- "../../modules/audio_device:audio_device",
+ "../../modules/audio_device",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
@@ -957,7 +957,7 @@
":peerconnection_jni",
"//api:libjingle_peerconnection_api",
"//api/video_codecs:video_codecs_api",
- "//rtc_base:rtc_base",
+ "//rtc_base",
]
}
@@ -993,7 +993,7 @@
":videoframe_jni",
"//api:libjingle_peerconnection_api",
"//api/video:video_frame",
- "//rtc_base:rtc_base",
+ "//rtc_base",
"//rtc_base:rtc_base_approved",
"//third_party/abseil-cpp/absl/memory",
]
@@ -1056,9 +1056,9 @@
"../../logging:rtc_event_log_api",
"../../logging:rtc_event_log_impl_base",
"../../media:rtc_audio_video",
- "../../modules/audio_device:audio_device",
+ "../../modules/audio_device",
+ "../../modules/audio_processing",
"../../modules/audio_processing:api",
- "../../modules/audio_processing:audio_processing",
]
}
@@ -1090,9 +1090,9 @@
":native_api_jni",
"../../api:scoped_refptr",
"../../api/video:video_frame",
- "../../common_video:common_video",
+ "../../common_video",
+ "../../rtc_base",
"../../rtc_base:checks",
- "../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
]
}
@@ -1108,7 +1108,7 @@
":base_jni",
":generated_logging_jni",
":native_api_jni",
- "../../rtc_base:rtc_base",
+ "../../rtc_base",
]
}
@@ -1148,7 +1148,7 @@
":audio_device_module_base",
":base_jni",
":generated_java_audio_device_module_native_jni",
- "../../modules/audio_device:audio_device",
+ "../../modules/audio_device",
"../../modules/audio_device:audio_device_buffer",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
@@ -1174,10 +1174,10 @@
":audio_device_module_base",
":base_jni",
"../../api:array_view",
- "../../modules/audio_device:audio_device",
+ "../../modules/audio_device",
"../../modules/audio_device:audio_device_buffer",
+ "../../rtc_base",
"../../rtc_base:checks",
- "../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"//third_party/abseil-cpp/absl/types:optional",
@@ -1200,7 +1200,7 @@
":audio_device_module_base",
":base_jni",
"../../api:array_view",
- "../../modules/audio_device:audio_device",
+ "../../modules/audio_device",
"../../modules/audio_device:audio_device_buffer",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
@@ -1480,7 +1480,7 @@
":libjingle_peerconnection_jni",
":libjingle_peerconnection_metrics_default_jni",
"../../pc:libjingle_peerconnection",
- "../../rtc_base:rtc_base",
+ "../../rtc_base",
]
output_extension = "so"
}
@@ -1541,11 +1541,11 @@
"../../media:rtc_audio_video",
"../../media:rtc_internal_video_codecs",
"../../media:rtc_media_base",
- "../../modules/audio_device:audio_device",
+ "../../modules/audio_device",
"../../modules/audio_device:mock_audio_device",
+ "../../modules/audio_processing",
"../../modules/audio_processing:api",
- "../../modules/audio_processing:audio_processing",
- "../../modules/utility:utility",
+ "../../modules/utility",
"../../pc:libjingle_peerconnection",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",