From 5584bf4c4da20e9d5ed6f0e86352791885062f9b Mon Sep 17 00:00:00 2001 From: jbroman Date: Tue, 12 Jan 2016 09:46:55 -0800 Subject: [PATCH] Make :rtc_base_approved a public dep of :rtc_base. It looks to me like targets :rtc_base_approved is logically a subset of :rtc_base, and so any targets depending on :rtc_base expect to also get access to the headers in :rtc_base_approved. Thus I think it's appropriate for :rtc_base to have :rtc_base_approved in public_deps, so that `gn check` will permit this without clients having to explicitly depend on both. NOTRY=True Review URL: https://codereview.webrtc.org/1578833002 Cr-Commit-Position: refs/heads/master@{#11227} --- webrtc/base/BUILD.gn | 3 ++- webrtc/base/base.gyp | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn index 0cc363a5c9..0f7a3f2fbe 100644 --- a/webrtc/base/BUILD.gn +++ b/webrtc/base/BUILD.gn @@ -177,7 +177,8 @@ static_library("rtc_base") { cflags = [] cflags_cc = [] libs = [] - deps = [ + deps = [] + public_deps = [ ":rtc_base_approved", ] diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp index f43e9e397c..c9182632ab 100644 --- a/webrtc/base/base.gyp +++ b/webrtc/base/base.gyp @@ -152,6 +152,9 @@ '<(webrtc_root)/common.gyp:webrtc_common', 'rtc_base_approved', ], + 'export_dependent_settings': [ + 'rtc_base_approved', + ], 'defines': [ 'FEATURE_ENABLE_SSL', 'SSL_USE_OPENSSL',