aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjbroman <jbroman@chromium.org>2016-01-12 09:46:55 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-12 17:46:59 +0000
commit5584bf4c4da20e9d5ed6f0e86352791885062f9b (patch)
treed83ee55104b28c383bc2296ffdc957650d045a92
parente84e96e8be15fb80a1cf37ba6ef70c01cc94199d (diff)
downloadwebrtc-5584bf4c4da20e9d5ed6f0e86352791885062f9b.tar.gz
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}
-rw-r--r--webrtc/base/BUILD.gn3
-rw-r--r--webrtc/base/base.gyp3
2 files changed, 5 insertions, 1 deletions
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',