| Index: net/net.gyp
|
| diff --git a/net/net.gyp b/net/net.gyp
|
| index f183bef13bd22b5c2100361c7f2b61a3ea6c24cc..621fe7d9f36c840dac4a3bcaf39c7bee7c64f2d4 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,
|
| 'conditions': [
|
| ['chromeos==1 or embedded==1 or OS=="ios"', {
|
| # Disable Kerberos on ChromeOS and iOS, at least for now.
|
| @@ -111,6 +113,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': [
|
| @@ -121,6 +124,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)',
|
| @@ -1350,6 +1364,7 @@
|
| },
|
| 'dependencies': [
|
| '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
|
| + 'net_features',
|
| ],
|
| 'defines': [
|
| 'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
|
|
|