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}

examples/BUILD.gn

@@ -548,7 +548,7 @@ if (is_linux || is_win) {
       "../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 @@ if (is_win || is_android) {
       "../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",

media/BUILD.gn

@@ -10,7 +10,7 @@ import("//build/config/linux/pkg_config.gni")
 import("../webrtc.gni")
 
 group("media") {
-  public_deps = [
+  deps = [
     ":rtc_media",
     ":rtc_media_base",
   ]
@@ -61,7 +61,6 @@ rtc_static_library("rtc_media_base") {
     "../rtc_base:sanitizer",
     "../rtc_base:stringutils",
   ]
-  public_deps = []
   sources = [
     "base/adaptedvideotracksource.cc",
     "base/adaptedvideotracksource.h",
@@ -102,6 +101,7 @@ rtc_static_library("rtc_media_base") {
   }
 
   deps += [
+    ":rtc_h264_profile_id",
     "..:webrtc_common",
     "../api:libjingle_peerconnection_api",
     "../api:optional",
@@ -119,8 +119,6 @@ rtc_static_library("rtc_media_base") {
     "../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 @@ rtc_static_library("rtc_internal_video_codecs") {
   defines = []
   libs = []
   deps = [
+    ":rtc_h264_profile_id",
     "../modules/video_coding:video_codec_interface",
   ]
   sources = [
@@ -375,7 +374,7 @@ rtc_static_library("rtc_data") {
 
 rtc_source_set("rtc_media") {
   visibility = [ "*" ]
-  public_deps = [
+  deps = [
     ":rtc_audio_video",
     ":rtc_data",
   ]
@@ -395,8 +394,8 @@ if (rtc_include_tests) {
     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 @@ if (rtc_include_tests) {
       "../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 @@ if (rtc_include_tests) {
 
     defines = []
     deps = [
+      ":rtc_audio_video",
       ":rtc_constants",
+      ":rtc_data",
       "../api:video_frame_api_i420",
       "../modules/audio_processing:mocks",
       "../modules/video_coding:video_codec_interface",

modules/video_coding/BUILD.gn

@@ -231,6 +231,7 @@ rtc_static_library("webrtc_h264") {
     ":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 @@ if (rtc_include_tests) {
       "../../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",

ortc/BUILD.gn

@@ -39,6 +39,7 @@ rtc_static_library("ortc") {
     "../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",

pc/BUILD.gn

@@ -355,6 +355,7 @@ if (rtc_include_tests) {
       "../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",

sdk/BUILD.gn

@@ -847,6 +847,7 @@ if (is_ios || is_mac) {
         "../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",

sdk/android/BUILD.gn

@@ -241,6 +241,7 @@ rtc_static_library("video_jni") {
     "../../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",

test/fuzzers/BUILD.gn

@@ -320,6 +320,7 @@ webrtc_fuzzer_test("turn_unwrap_fuzzer") {
   ]
   deps = [
     "../../media:media",
+    "../../media:rtc_media_base",
   ]
 }
 

video/BUILD.gn

@@ -299,6 +299,7 @@ if (rtc_include_tests) {
       "../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",