Stop using public_deps in media/.
Bug: webrtc:8603
Change-Id: I7a6dad323ac298dc784feb5aa1fdc2ae5876cb5c
No-Try: True
Reviewed-on: https://webrtc-review.googlesource.com/33180
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21591}diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 9d4f570..36065e4 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -548,7 +548,7 @@
"../api:video_frame_api",
"../api/audio_codecs:builtin_audio_decoder_factory",
"../api/audio_codecs:builtin_audio_encoder_factory",
- "../media:rtc_media",
+ "../media:rtc_audio_video",
"../modules/video_capture:video_capture_module",
"../pc:libjingle_peerconnection",
"../rtc_base:rtc_base",
@@ -678,6 +678,7 @@
"../api/audio_codecs:builtin_audio_decoder_factory",
"../api/audio_codecs:builtin_audio_encoder_factory",
"../common_video",
+ "../media:rtc_audio_video",
"../media:rtc_internal_video_codecs",
"../media:rtc_media",
"../media:rtc_media_base",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 54473fe..9baeb45 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -10,7 +10,7 @@
import("../webrtc.gni")
group("media") {
- public_deps = [
+ deps = [
":rtc_media",
":rtc_media_base",
]
@@ -61,7 +61,6 @@
"../rtc_base:sanitizer",
"../rtc_base:stringutils",
]
- public_deps = []
sources = [
"base/adaptedvideotracksource.cc",
"base/adaptedvideotracksource.h",
@@ -102,6 +101,7 @@
}
deps += [
+ ":rtc_h264_profile_id",
"..:webrtc_common",
"../api:libjingle_peerconnection_api",
"../api:optional",
@@ -119,8 +119,6 @@
"../system_wrappers:field_trial_api",
]
- public_deps += [ ":rtc_h264_profile_id" ]
-
if (is_nacl) {
deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
}
@@ -141,6 +139,7 @@
defines = []
libs = []
deps = [
+ ":rtc_h264_profile_id",
"../modules/video_coding:video_codec_interface",
]
sources = [
@@ -375,7 +374,7 @@
rtc_source_set("rtc_media") {
visibility = [ "*" ]
- public_deps = [
+ deps = [
":rtc_audio_video",
":rtc_data",
]
@@ -395,8 +394,8 @@
testonly = true
include_dirs = []
- public_deps = []
deps = [
+ ":rtc_audio_video",
"../api:libjingle_peerconnection_api",
"../api:video_frame_api_i420",
"../call:video_stream_api",
@@ -448,9 +447,9 @@
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
"../test:test_support",
+ "//testing/gmock",
"//testing/gtest",
]
- public_deps += [ "//testing/gmock" ]
}
config("rtc_media_unittests_config") {
@@ -496,7 +495,9 @@
defines = []
deps = [
+ ":rtc_audio_video",
":rtc_constants",
+ ":rtc_data",
"../api:video_frame_api_i420",
"../modules/audio_processing:mocks",
"../modules/video_coding:video_codec_interface",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 4308f74..8341132 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -231,6 +231,7 @@
":video_coding_utility",
"../../api:video_frame_api_i420",
"../../api/video_codecs:video_codecs_api",
+ "../../media:rtc_h264_profile_id",
"../../media:rtc_media_base",
"../../rtc_base:checks",
"../../rtc_base:rtc_base",
@@ -565,6 +566,7 @@
"../../api/video_codecs:video_codecs_api",
"../../common_video",
"../../media:rtc_audio_video",
+ "../../media:rtc_h264_profile_id",
"../../media:rtc_internal_video_codecs",
"../../media:rtc_media_base",
"../../rtc_base:checks",
diff --git a/ortc/BUILD.gn b/ortc/BUILD.gn
index 7aaa929..0150d89 100644
--- a/ortc/BUILD.gn
+++ b/ortc/BUILD.gn
@@ -39,6 +39,7 @@
"../call:call_interfaces",
"../call:rtp_sender",
"../logging:rtc_event_log_api",
+ "../media:rtc_audio_video",
"../media:rtc_media",
"../media:rtc_media_base",
"../modules/audio_processing:audio_processing",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index b494b14..7db227e 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -355,6 +355,7 @@
"../api:rtc_stats_api",
"../call:call_interfaces",
"../logging:rtc_event_log_api",
+ "../media:rtc_data",
"../media:rtc_media",
"../media:rtc_media_base",
"../media:rtc_media_tests_utils",
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 9ecc01f..3896bef 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -847,6 +847,7 @@
"../api:video_frame_api",
"../api/video_codecs:video_codecs_api",
"../common_video",
+ "../media:rtc_audio_video",
"../media:rtc_internal_video_codecs",
"../media:rtc_media",
"../media:rtc_media_base",
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 92a35fd..8305e4d 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -241,6 +241,7 @@
"../../api/video_codecs:video_codecs_api",
"../../common_video:common_video",
"../../media:rtc_audio_video",
+ "../../media:rtc_h264_profile_id",
"../../media:rtc_internal_video_codecs",
"../../media:rtc_media_base",
"../../modules:module_api",
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index 19d1302..1a400c8 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -320,6 +320,7 @@
]
deps = [
"../../media:media",
+ "../../media:rtc_media_base",
]
}
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 552bfb4..6901279 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -299,6 +299,7 @@
"../call:video_stream_api",
"../common_video",
"../logging:rtc_event_log_api",
+ "../media:rtc_audio_video",
"../media:rtc_internal_video_codecs",
"../media:rtc_media",
"../media:rtc_media_base",
