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

Unified Diff: net/BUILD.gn

Issue 1550843002: Convert enable_bidirectional_stream into build flag local to net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync Created 4 years, 11 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 | « build/common.gypi ('k') | net/http/bidirectional_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 953c6e3f386425f63916155037df9d7237b8810f..129003a59353399c3365eb0fa97d5aba735d11dd 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/buildflag_header.gni")
import("//build/config/chromecast_build.gni")
import("//build/config/compiler/compiler.gni")
import("//build/config/crypto.gni")
@@ -43,6 +44,8 @@ enable_built_in_dns = !is_ios
declare_args() {
# Disables support for file URLs. File URL support requires use of icu.
disable_file_support = false
+
+ # Enables BidirectionalStream; Used in cronet, disabled by default.
enable_bidirectional_stream = false
# WebSockets and socket stream code are not used on iOS and are optional in
@@ -62,9 +65,6 @@ config("net_config") {
if (disable_ftp_support) {
defines += [ "DISABLE_FTP_SUPPORT=1" ]
}
- if (enable_bidirectional_stream) {
- defines += [ "ENABLE_BIDIRECTIONAL_STREAM=1" ]
- }
}
# net_internal_config is shared with net and net_small.
@@ -105,6 +105,7 @@ net_shared_configs = [
]
net_shared_public_deps = [
+ ":features",
":net_quic_proto",
"//crypto",
"//crypto:platform",
@@ -491,6 +492,10 @@ if (is_android) {
# Disable Brotli support.
sources += [ "filter/brotli_filter_disabled.cc" ]
+
+ if (enable_bidirectional_stream) {
+ sources += gypi_values.net_bidirectional_stream_sources
+ }
}
}
@@ -1728,3 +1733,9 @@ executable("net_perftests") {
sources -= [ "proxy/proxy_resolver_perftest.cc" ]
}
}
+
+buildflag_header("features") {
+ header = "net_features.h"
+
+ flags = [ "ENABLE_BIDIRECTIONAL_STREAM=$enable_bidirectional_stream" ]
+}
« no previous file with comments | « build/common.gypi ('k') | net/http/bidirectional_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698