From 16adf03d2555f186ae7c986a405c657c35aaca6d Mon Sep 17 00:00:00 2001 From: mbonadei Date: Wed, 30 Aug 2017 04:45:58 -0700 Subject: [PATCH] Recently we moved webrtc/base to webrtc/rtc_base, so these directives in our DEPS files are not needed anymore. Includes from webrtc/rtc_base are also whitelisted in webrtc/DEPS so we don't have to whitelist it in all the others DEPS files. BUG=webrtc:7634 NOTRY=True Review-Url: https://codereview.webrtc.org/3006583002 Cr-Commit-Position: refs/heads/master@{#19601} --- webrtc/DEPS | 1 - webrtc/api/DEPS | 1 - webrtc/audio/DEPS | 1 - webrtc/call/DEPS | 1 - webrtc/common_audio/DEPS | 1 - webrtc/common_video/DEPS | 1 - webrtc/examples/DEPS | 1 - webrtc/logging/rtc_event_log/DEPS | 1 - webrtc/media/DEPS | 1 - webrtc/modules/audio_coding/DEPS | 1 - webrtc/modules/audio_conference_mixer/DEPS | 1 - webrtc/modules/audio_device/DEPS | 1 - webrtc/modules/audio_mixer/DEPS | 1 - webrtc/modules/audio_processing/DEPS | 1 - webrtc/modules/bitrate_controller/DEPS | 1 - webrtc/modules/congestion_controller/DEPS | 1 - webrtc/modules/desktop_capture/DEPS | 1 - webrtc/modules/include/DEPS | 1 - webrtc/modules/media_file/DEPS | 1 - webrtc/modules/pacing/DEPS | 1 - webrtc/modules/remote_bitrate_estimator/DEPS | 1 - webrtc/modules/rtp_rtcp/DEPS | 1 - webrtc/modules/utility/DEPS | 1 - webrtc/modules/video_capture/DEPS | 1 - webrtc/modules/video_coding/DEPS | 1 - webrtc/modules/video_processing/DEPS | 1 - webrtc/ortc/DEPS | 1 - webrtc/p2p/DEPS | 1 - webrtc/pc/DEPS | 1 - webrtc/rtc_tools/DEPS | 1 - webrtc/stats/DEPS | 1 - webrtc/system_wrappers/DEPS | 1 - webrtc/test/DEPS | 1 - webrtc/video/DEPS | 1 - webrtc/voice_engine/DEPS | 1 - 35 files changed, 35 deletions(-) diff --git a/webrtc/DEPS b/webrtc/DEPS index 74cf09df16..276991d119 100644 --- a/webrtc/DEPS +++ b/webrtc/DEPS @@ -17,7 +17,6 @@ include_rules = [ "+WebRTC", "+webrtc/api", - "+webrtc/base", "+webrtc/modules/include", "+webrtc/rtc_base", "+webrtc/test", diff --git a/webrtc/api/DEPS b/webrtc/api/DEPS index b0493fab54..b73e337aa6 100644 --- a/webrtc/api/DEPS +++ b/webrtc/api/DEPS @@ -1,6 +1,5 @@ include_rules = [ "+third_party/libyuv", - "+webrtc/base", "+webrtc/common_video", "+webrtc/media", "+webrtc/p2p", diff --git a/webrtc/audio/DEPS b/webrtc/audio/DEPS index da9e8e1c81..e77e1d1f4c 100644 --- a/webrtc/audio/DEPS +++ b/webrtc/audio/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/call", "+webrtc/common_audio", "+webrtc/logging/rtc_event_log", diff --git a/webrtc/call/DEPS b/webrtc/call/DEPS index 65026b0257..54dcebb526 100644 --- a/webrtc/call/DEPS +++ b/webrtc/call/DEPS @@ -1,6 +1,5 @@ include_rules = [ "+webrtc/audio", - "+webrtc/base", "+webrtc/logging/rtc_event_log", "+webrtc/modules/audio_coding", "+webrtc/modules/audio_device", diff --git a/webrtc/common_audio/DEPS b/webrtc/common_audio/DEPS index 7df03ea3fe..01e7f315a2 100644 --- a/webrtc/common_audio/DEPS +++ b/webrtc/common_audio/DEPS @@ -1,5 +1,4 @@ include_rules = [ "+dl/sp/api", # For openmax_dl. - "+webrtc/base", "+webrtc/system_wrappers", ] diff --git a/webrtc/common_video/DEPS b/webrtc/common_video/DEPS index 7dbbdb4f95..0044419e62 100644 --- a/webrtc/common_video/DEPS +++ b/webrtc/common_video/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/media/base", "+webrtc/system_wrappers", # TODO(magjed): This is temporary, remove once external clients are updated. diff --git a/webrtc/examples/DEPS b/webrtc/examples/DEPS index 524aa26376..6c26780e3c 100644 --- a/webrtc/examples/DEPS +++ b/webrtc/examples/DEPS @@ -1,7 +1,6 @@ include_rules = [ "+WebRTC", "+webrtc/api", - "+webrtc/base", "+webrtc/media", "+webrtc/modules/audio_device", "+webrtc/modules/video_capture", diff --git a/webrtc/logging/rtc_event_log/DEPS b/webrtc/logging/rtc_event_log/DEPS index 58257f5ad8..f0ae6d1767 100644 --- a/webrtc/logging/rtc_event_log/DEPS +++ b/webrtc/logging/rtc_event_log/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/call", "+webrtc/modules/audio_coding/audio_network_adaptor", "+webrtc/modules/remote_bitrate_estimator/include", diff --git a/webrtc/media/DEPS b/webrtc/media/DEPS index 81cd321e81..3d3dce4740 100644 --- a/webrtc/media/DEPS +++ b/webrtc/media/DEPS @@ -1,6 +1,5 @@ include_rules = [ "+webrtc/api", - "+webrtc/base", "+webrtc/call", "+webrtc/common_video", "+webrtc/logging/rtc_event_log", diff --git a/webrtc/modules/audio_coding/DEPS b/webrtc/modules/audio_coding/DEPS index 013cce7a6d..3a745ffa99 100644 --- a/webrtc/modules/audio_coding/DEPS +++ b/webrtc/modules/audio_coding/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/call", "+webrtc/common_audio", "+webrtc/logging/rtc_event_log", diff --git a/webrtc/modules/audio_conference_mixer/DEPS b/webrtc/modules/audio_conference_mixer/DEPS index 0b95ab733f..031c60256f 100644 --- a/webrtc/modules/audio_conference_mixer/DEPS +++ b/webrtc/modules/audio_conference_mixer/DEPS @@ -1,5 +1,4 @@ include_rules = [ "+webrtc/audio/utility/audio_frame_operations.h", - "+webrtc/base", "+webrtc/system_wrappers", ] diff --git a/webrtc/modules/audio_device/DEPS b/webrtc/modules/audio_device/DEPS index 8ad9db7a3b..3ae86e8841 100644 --- a/webrtc/modules/audio_device/DEPS +++ b/webrtc/modules/audio_device/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/common_audio", "+webrtc/system_wrappers", ] diff --git a/webrtc/modules/audio_mixer/DEPS b/webrtc/modules/audio_mixer/DEPS index 647ba2af8d..025ce053a2 100644 --- a/webrtc/modules/audio_mixer/DEPS +++ b/webrtc/modules/audio_mixer/DEPS @@ -1,6 +1,5 @@ include_rules = [ "+webrtc/audio/utility/audio_frame_operations.h", - "+webrtc/base", "+webrtc/call", "+webrtc/common_audio", "+webrtc/modules/audio_coding", diff --git a/webrtc/modules/audio_processing/DEPS b/webrtc/modules/audio_processing/DEPS index 9b588d0936..742971fd1a 100644 --- a/webrtc/modules/audio_processing/DEPS +++ b/webrtc/modules/audio_processing/DEPS @@ -1,6 +1,5 @@ include_rules = [ "+webrtc/audio/utility/audio_frame_operations.h", - "+webrtc/base", "+webrtc/common_audio", "+webrtc/system_wrappers", ] diff --git a/webrtc/modules/bitrate_controller/DEPS b/webrtc/modules/bitrate_controller/DEPS index 553c36b973..f84eb8d531 100644 --- a/webrtc/modules/bitrate_controller/DEPS +++ b/webrtc/modules/bitrate_controller/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/call", "+webrtc/logging/rtc_event_log", "+webrtc/system_wrappers", diff --git a/webrtc/modules/congestion_controller/DEPS b/webrtc/modules/congestion_controller/DEPS index 30984edc96..1bff84528f 100644 --- a/webrtc/modules/congestion_controller/DEPS +++ b/webrtc/modules/congestion_controller/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/logging/rtc_event_log", "+webrtc/system_wrappers", "+webrtc/video", diff --git a/webrtc/modules/desktop_capture/DEPS b/webrtc/modules/desktop_capture/DEPS index 9229e7f19b..43c844105b 100644 --- a/webrtc/modules/desktop_capture/DEPS +++ b/webrtc/modules/desktop_capture/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/system_wrappers", "+third_party/libyuv", ] diff --git a/webrtc/modules/include/DEPS b/webrtc/modules/include/DEPS index aad6d8a855..d3f1725335 100644 --- a/webrtc/modules/include/DEPS +++ b/webrtc/modules/include/DEPS @@ -1,4 +1,3 @@ include_rules = [ - "+webrtc/base", "+webrtc/common_video", ] diff --git a/webrtc/modules/media_file/DEPS b/webrtc/modules/media_file/DEPS index 5c5452a0c0..45852cd4e1 100644 --- a/webrtc/modules/media_file/DEPS +++ b/webrtc/modules/media_file/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/common_audio", "+webrtc/system_wrappers", ] diff --git a/webrtc/modules/pacing/DEPS b/webrtc/modules/pacing/DEPS index e4b8c616db..ab0885b6b9 100644 --- a/webrtc/modules/pacing/DEPS +++ b/webrtc/modules/pacing/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/system_wrappers", "+webrtc/logging/rtc_event_log" ] diff --git a/webrtc/modules/remote_bitrate_estimator/DEPS b/webrtc/modules/remote_bitrate_estimator/DEPS index d061d5761a..6d0079d14f 100644 --- a/webrtc/modules/remote_bitrate_estimator/DEPS +++ b/webrtc/modules/remote_bitrate_estimator/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/logging/rtc_event_log", "+webrtc/system_wrappers", ] diff --git a/webrtc/modules/rtp_rtcp/DEPS b/webrtc/modules/rtp_rtcp/DEPS index 4004651c91..83abb27473 100644 --- a/webrtc/modules/rtp_rtcp/DEPS +++ b/webrtc/modules/rtp_rtcp/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/call", "+webrtc/common_video", "+webrtc/logging/rtc_event_log", diff --git a/webrtc/modules/utility/DEPS b/webrtc/modules/utility/DEPS index d07d352817..7e573560ea 100644 --- a/webrtc/modules/utility/DEPS +++ b/webrtc/modules/utility/DEPS @@ -2,7 +2,6 @@ include_rules = [ # TODO(aleloi): remove when clients update. See # bugs.webrtc.org/6548. "+webrtc/audio/utility/audio_frame_operations.h", - "+webrtc/base", "+webrtc/common_audio", "+webrtc/common_video", "+webrtc/system_wrappers", diff --git a/webrtc/modules/video_capture/DEPS b/webrtc/modules/video_capture/DEPS index 1c271d9c1b..86af6db1c8 100644 --- a/webrtc/modules/video_capture/DEPS +++ b/webrtc/modules/video_capture/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/common_video", "+webrtc/media/base", "+webrtc/system_wrappers", diff --git a/webrtc/modules/video_coding/DEPS b/webrtc/modules/video_coding/DEPS index 69984cf03f..09f9152074 100644 --- a/webrtc/modules/video_coding/DEPS +++ b/webrtc/modules/video_coding/DEPS @@ -2,7 +2,6 @@ include_rules = [ "+third_party/ffmpeg", "+third_party/openh264", "+vpx", - "+webrtc/base", "+webrtc/call", "+webrtc/common_video", "+webrtc/system_wrappers", diff --git a/webrtc/modules/video_processing/DEPS b/webrtc/modules/video_processing/DEPS index 1a2885bbd3..a0dd9c33be 100644 --- a/webrtc/modules/video_processing/DEPS +++ b/webrtc/modules/video_processing/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/common_audio", "+webrtc/common_video", "+webrtc/system_wrappers", diff --git a/webrtc/ortc/DEPS b/webrtc/ortc/DEPS index 4e182440fb..b72aa6b9e0 100644 --- a/webrtc/ortc/DEPS +++ b/webrtc/ortc/DEPS @@ -1,6 +1,5 @@ include_rules = [ "+webrtc/api", - "+webrtc/base", "+webrtc/call", "+webrtc/logging/rtc_event_log", "+webrtc/media", diff --git a/webrtc/p2p/DEPS b/webrtc/p2p/DEPS index 161835f343..083e8d49d1 100644 --- a/webrtc/p2p/DEPS +++ b/webrtc/p2p/DEPS @@ -1,5 +1,4 @@ include_rules = [ "+net", - "+webrtc/base", "+webrtc/system_wrappers", ] diff --git a/webrtc/pc/DEPS b/webrtc/pc/DEPS index ee87af146e..20bbba2cc6 100644 --- a/webrtc/pc/DEPS +++ b/webrtc/pc/DEPS @@ -1,7 +1,6 @@ include_rules = [ "+third_party/libsrtp", "+webrtc/api", - "+webrtc/base", "+webrtc/call", "+webrtc/common_video/h264", "+webrtc/logging/rtc_event_log", diff --git a/webrtc/rtc_tools/DEPS b/webrtc/rtc_tools/DEPS index c55eb59645..69b7e58721 100644 --- a/webrtc/rtc_tools/DEPS +++ b/webrtc/rtc_tools/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/call", "+webrtc/common_video", "+webrtc/logging/rtc_event_log", diff --git a/webrtc/stats/DEPS b/webrtc/stats/DEPS index 6431936921..276073f77f 100644 --- a/webrtc/stats/DEPS +++ b/webrtc/stats/DEPS @@ -1,5 +1,4 @@ include_rules = [ "+webrtc/api", - "+webrtc/base", "+webrtc/media", ] diff --git a/webrtc/system_wrappers/DEPS b/webrtc/system_wrappers/DEPS index 7452a9fb16..f1bede577d 100644 --- a/webrtc/system_wrappers/DEPS +++ b/webrtc/system_wrappers/DEPS @@ -1,4 +1,3 @@ include_rules = [ - "+webrtc/base", ] diff --git a/webrtc/test/DEPS b/webrtc/test/DEPS index 9d4e6afdf0..33d0e48dc5 100644 --- a/webrtc/test/DEPS +++ b/webrtc/test/DEPS @@ -1,7 +1,6 @@ include_rules = [ "+third_party/libjpeg", "+third_party/libjpeg_turbo", - "+webrtc/base", "+webrtc/call", "+webrtc/common_audio", "+webrtc/common_video", diff --git a/webrtc/video/DEPS b/webrtc/video/DEPS index 258bb92954..b80e1c9a9a 100644 --- a/webrtc/video/DEPS +++ b/webrtc/video/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+webrtc/base", "+webrtc/call", "+webrtc/common_video", "+webrtc/logging/rtc_event_log", diff --git a/webrtc/voice_engine/DEPS b/webrtc/voice_engine/DEPS index 9f6d0d52e1..c5a97ccdfc 100644 --- a/webrtc/voice_engine/DEPS +++ b/webrtc/voice_engine/DEPS @@ -1,6 +1,5 @@ include_rules = [ "+webrtc/audio/utility/audio_frame_operations.h", - "+webrtc/base", "+webrtc/call", "+webrtc/common_audio", "+webrtc/logging/rtc_event_log",