From bba675db3eb4eaedd110427b7cf8afdb7409e2e1 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Thu, 27 Dec 2018 11:15:19 -0800 Subject: [PATCH] Clean up api/ DEPS Add missing entries, move definitions to closer DEPS files. Tbr: shampson@webrtc.org Tbr: terelius@webrtc.org Bug: None Change-Id: I07574ad4d440eb729d21aba673981833261c1fcf Reviewed-on: https://webrtc-review.googlesource.com/c/115742 Commit-Queue: Steve Anton Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#26114} --- api/DEPS | 48 ++++++++++++++++++++---------------------------- api/test/DEPS | 3 +++ api/video/DEPS | 21 +++++++++++++++++++++ 3 files changed, 44 insertions(+), 28 deletions(-) diff --git a/api/DEPS b/api/DEPS index e4bb408cc1..82885d4321 100644 --- a/api/DEPS +++ b/api/DEPS @@ -116,10 +116,29 @@ specific_include_rules = { "+rtc_base/bind.h", ], + "peerconnectioninterface\.h": [ + "+logging/rtc_event_log/rtc_event_log_factory_interface.h", + "+media/base/mediaconfig.h", + "+media/base/videocapturer.h", + "+media/base/mediaengine.h", + "+p2p/base/portallocator.h", + "+rtc_base/bitrateallocationstrategy.h", + "+rtc_base/network.h", + "+rtc_base/platform_file.h", + "+rtc_base/rtccertificate.h", + "+rtc_base/rtccertificategenerator.h", + "+rtc_base/socketaddress.h", + "+rtc_base/sslcertificate.h", + "+rtc_base/sslstreamadapter.h", + ], + "proxy\.h": [ + "+rtc_base/event.h", "+rtc_base/messagehandler.h", # Inherits from it. "+rtc_base/messagequeue.h", # Inherits from MessageData. + "+rtc_base/refcountedobject.h", "+rtc_base/scoped_ref_ptr.h", + "+rtc_base/thread.h", ], "refcountedbase\.h": [ @@ -144,6 +163,7 @@ specific_include_rules = { "rtptransceiverinterface\.h": [ "+rtc_base/refcount.h", + "+rtc_base/scoped_ref_ptr.h", ], "setremotedescriptionobserverinterface\.h": [ @@ -214,16 +234,6 @@ specific_include_rules = { "+rtc_base/refcount.h", ], - "ortcfactoryinterface\.h": [ - "+rtc_base/network.h", - "+rtc_base/scoped_ref_ptr.h", - "+rtc_base/thread.h", - ], - - "udptransportinterface\.h": [ - "+rtc_base/socketaddress.h", - ], - "rtcstatscollectorcallback\.h": [ "+rtc_base/refcount.h", "+rtc_base/scoped_ref_ptr.h", @@ -247,10 +257,6 @@ specific_include_rules = { "+rtc_base/refcountedobject.h", ], - "fakeconstraints\.h": [ - "+rtc_base/stringencode.h", - ], - "mock.*\.h": [ "+test/gmock.h", ], @@ -269,20 +275,6 @@ specific_include_rules = { "+modules/video_coding/include/video_codec_interface.h" ], - "i010_buffer\.h": [ - "+rtc_base/memory/aligned_malloc.h", - "+rtc_base/scoped_ref_ptr.h", - ], - - "i420_buffer\.h": [ - "+rtc_base/memory/aligned_malloc.h", - ], - - "video_frame_buffer\.h": [ - "+rtc_base/refcount.h", - "+rtc_base/scoped_ref_ptr.h", - ], - "video_timing\.h": [ "+rtc_base/numerics/safe_conversions.h", ], diff --git a/api/test/DEPS b/api/test/DEPS index 9c293b323e..6c1ab93919 100644 --- a/api/test/DEPS +++ b/api/test/DEPS @@ -5,6 +5,9 @@ specific_include_rules = { ".*": [ "+video" ], + "fakeconstraints\.h": [ + "+rtc_base/stringencode.h", + ], "loopback_media_transport\.h": [ "+rtc_base/asyncinvoker.h", "+rtc_base/criticalsection.h", diff --git a/api/video/DEPS b/api/video/DEPS index aec927baaa..a76b5540cc 100644 --- a/api/video/DEPS +++ b/api/video/DEPS @@ -5,9 +5,30 @@ specific_include_rules = { "encoded_frame.h": [ "+modules/video_coding/encoded_frame.h", ], + + "i010_buffer\.h": [ + "+rtc_base/memory/aligned_malloc.h", + "+rtc_base/scoped_ref_ptr.h", + ], + + "i420_buffer\.h": [ + "+rtc_base/memory/aligned_malloc.h", + "+rtc_base/scoped_ref_ptr.h", + ], + + "video_frame\.h": [ + "+rtc_base/scoped_ref_ptr.h", + ], + + "video_frame_buffer\.h": [ + "+rtc_base/refcount.h", + "+rtc_base/scoped_ref_ptr.h", + ], + "video_stream_decoder_create.cc": [ "+video/video_stream_decoder_impl.h", ], + "video_stream_encoder_create.cc": [ "+video/video_stream_encoder.h", ],