Chromium Code Reviews| Index: net/net.gyp |
| diff --git a/net/net.gyp b/net/net.gyp |
| index c7c99178acc7f2606c5b4db22a52a755bde7b734..a3508d4bcf390cd325ce9fdbb2f3a101f02e138d 100644 |
| --- a/net/net.gyp |
| +++ b/net/net.gyp |
| @@ -6,6 +6,8 @@ |
| 'variables': { |
| 'chromium_code': 1, |
| 'linux_link_kerberos%': 0, |
| + # Enables BidirectionalStream; Used in cronet, disabled by default. |
| + 'enable_bidirectional_stream%': 0, |
|
mmenke
2016/01/07 18:16:41
How does this get set to true for cronet?
mef
2016/01/07 19:41:31
as usual, enable_bidirectional_stream=1 for GYP ge
|
| 'conditions': [ |
| ['chromeos==1 or embedded==1 or OS=="ios"', { |
| # Disable Kerberos on ChromeOS and iOS, at least for now. |
| @@ -112,6 +114,7 @@ |
| '../third_party/icu/icu.gyp:icuuc', |
| '../third_party/protobuf/protobuf.gyp:protobuf_lite', |
| '../url/url.gyp:url_lib', |
| + 'net_features', |
| 'net_quic_proto', |
| ], |
| 'sources': [ |
| @@ -123,6 +126,17 @@ |
| 'includes': [ 'net_common.gypi' ], |
| }, |
| { |
| + # GN version: //net:features |
| + 'target_name': 'net_features', |
| + 'includes': [ '../build/buildflag_header.gypi' ], |
| + 'variables': { |
| + 'buildflag_header_path': 'net/net_features.h', |
| + 'buildflag_flags': [ |
| + 'ENABLE_BIDIRECTIONAL_STREAM=<(enable_bidirectional_stream)', |
| + ], |
| + }, |
| + }, |
| + { |
| # GN version: //net:net_unittests |
| 'target_name': 'net_unittests', |
| 'type': '<(gtest_target_type)', |
| @@ -289,11 +303,7 @@ |
| 'sources!': [ |
| 'http/bidirectional_stream_unittest.cc', |
| ], |
| - }, { # else |
| - 'defines': [ |
|
mef
2016/01/06 22:51:43
It turns out that I've missed this define and it w
|
| - 'ENABLE_BIDIRECTIONAL_STREAM', |
| - ], |
| - } |
| + }, |
| ], |
| [ 'enable_built_in_dns!=1', { |
| 'sources!': [ |
| @@ -1359,6 +1369,7 @@ |
| }, |
| 'dependencies': [ |
| '../url/url.gyp:url_lib_use_icu_alternatives_on_android', |
| + 'net_features', |
| ], |
| 'defines': [ |
| 'USE_ICU_ALTERNATIVES_ON_ANDROID=1', |