Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(672)

Unified Diff: third_party/libjingle/BUILD.gn

Issue 583353002: Work toward enabling WebRTC in the GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/BUILD.gn
diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn
index ba32bdb3aaa89c4478942cedbe0bdd85a5c73b2f..5c3e483e51d761080498f38fd3a61a9c4d93e871 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/libjingle/BUILD.gn
@@ -249,10 +249,12 @@ static_library("libjingle") {
"source/talk/p2p/base/constants.cc",
"source/talk/p2p/base/constants.h",
]
+ public_deps = [
+ ":jingle_deps"
+ ]
deps = [
"//third_party/webrtc/base:webrtc_base",
":libjingle_p2p_constants",
- ":jingle_deps"
]
# From libjingle_common.gypi's conditions list.
@@ -260,13 +262,10 @@ static_library("libjingle") {
cflags = [ "/wd4005", "/wd4267" ]
}
- forward_dependent_configs_from = [
- ":jingle_deps"
- ]
configs += [
":jingle_unexported_configs"
]
- direct_dependent_configs = [
+ public_configs = [
":jingle_direct_dependent_configs",
]
all_dependent_configs = [
@@ -288,16 +287,13 @@ static_library("libjingle_p2p_constants") {
"source/talk/p2p/base/constants.cc",
"source/talk/p2p/base/constants.h",
]
- deps = [
- ":jingle_deps",
- ]
- forward_dependent_configs_from = [
+ public_deps = [
":jingle_deps",
]
configs += [
":jingle_unexported_configs"
]
- direct_dependent_configs = [
+ public_configs = [
":jingle_direct_dependent_configs",
]
all_dependent_configs = [
@@ -320,17 +316,17 @@ source_set("peerconnnection_server") {
include_dirs = [
"source",
]
- deps = [
- ":libjingle",
+ public_deps = [
":jingle_deps",
]
- forward_dependent_configs_from = [
+ deps = [
+ ":libjingle",
":jingle_deps",
]
configs += [
":jingle_unexported_configs"
]
- direct_dependent_configs = [
+ public_configs = [
":jingle_direct_dependent_configs",
]
all_dependent_configs = [
@@ -349,6 +345,8 @@ if (enable_webrtc) {
"overrides/init_webrtc.cc",
"overrides/init_webrtc.h",
]
+ configs += [ ":jingle_unexported_configs" ]
+ public_configs = [ ":jingle_direct_dependent_configs" ]
deps = [ ":libjingle_webrtc_common" ]
}
@@ -507,7 +505,7 @@ if (enable_webrtc) {
]
configs += [ ":jingle_unexported_configs" ]
- direct_dependent_configs = [ ":jingle_direct_dependent_configs" ]
+ public_configs = [ ":jingle_direct_dependent_configs" ]
deps = [
"//third_party/libsrtp",
@@ -546,7 +544,7 @@ if (enable_webrtc) {
]
configs += [ ":jingle_unexported_configs" ]
- direct_dependent_configs = [ ":jingle_direct_dependent_configs" ]
+ public_configs = [ ":jingle_direct_dependent_configs" ]
deps = [
":libjingle_webrtc_common",
« no previous file with comments | « content/browser/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698