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

Side by Side Diff: net/net.gyp

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: Created 4 years, 12 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 unified diff | Download patch
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'linux_link_kerberos%': 0, 8 'linux_link_kerberos%': 0,
9 # Enables BidirectionalStream; Used in cronet, disabled by default.
10 'enable_bidirectional_stream%': 0,
9 'conditions': [ 11 'conditions': [
10 ['chromeos==1 or embedded==1 or OS=="ios"', { 12 ['chromeos==1 or embedded==1 or OS=="ios"', {
11 # Disable Kerberos on ChromeOS and iOS, at least for now. 13 # Disable Kerberos on ChromeOS and iOS, at least for now.
12 # It needs configuration (krb5.conf and so on). 14 # It needs configuration (krb5.conf and so on).
13 'use_kerberos%': 0, 15 'use_kerberos%': 0,
14 }, { # chromeos == 0 and embedded==0 and OS!="ios" 16 }, { # chromeos == 0 and embedded==0 and OS!="ios"
15 'use_kerberos%': 1, 17 'use_kerberos%': 1,
16 }], 18 }],
17 ['OS=="android" and target_arch != "ia32"', { 19 ['OS=="android" and target_arch != "ia32"', {
18 # The way the cache uses mmap() is inefficient on some Android devices. 20 # The way the cache uses mmap() is inefficient on some Android devices.
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 }, 106 },
105 { 107 {
106 # GN version: //net 108 # GN version: //net
107 'target_name': 'net', 109 'target_name': 'net',
108 'dependencies': [ 110 'dependencies': [
109 '../base/base.gyp:base_i18n', 111 '../base/base.gyp:base_i18n',
110 '../third_party/icu/icu.gyp:icui18n', 112 '../third_party/icu/icu.gyp:icui18n',
111 '../third_party/icu/icu.gyp:icuuc', 113 '../third_party/icu/icu.gyp:icuuc',
112 '../third_party/protobuf/protobuf.gyp:protobuf_lite', 114 '../third_party/protobuf/protobuf.gyp:protobuf_lite',
113 '../url/url.gyp:url_lib', 115 '../url/url.gyp:url_lib',
116 'net_features',
114 'net_quic_proto', 117 'net_quic_proto',
115 ], 118 ],
116 'sources': [ 119 'sources': [
117 'base/filename_util_icu.cc', 120 'base/filename_util_icu.cc',
118 'base/net_string_util_icu.cc', 121 'base/net_string_util_icu.cc',
119 'base/net_util_icu.cc', 122 'base/net_util_icu.cc',
120 ], 123 ],
121 'includes': [ 'net_common.gypi' ], 124 'includes': [ 'net_common.gypi' ],
122 }, 125 },
123 { 126 {
127 # GN version: //net:features
128 'target_name': 'net_features',
129 'includes': [ '../build/buildflag_header.gypi' ],
130 'variables': {
131 'buildflag_header_path': 'net/net_features.h',
132 'buildflag_flags': [
133 'ENABLE_BIDIRECTIONAL_STREAM=<(enable_bidirectional_stream)',
134 ],
135 },
136 },
137 {
124 # GN version: //net:net_unittests 138 # GN version: //net:net_unittests
125 'target_name': 'net_unittests', 139 'target_name': 'net_unittests',
126 'type': '<(gtest_target_type)', 140 'type': '<(gtest_target_type)',
127 'dependencies': [ 141 'dependencies': [
128 '../base/base.gyp:base', 142 '../base/base.gyp:base',
129 '../base/base.gyp:base_i18n', 143 '../base/base.gyp:base_i18n',
130 '../base/base.gyp:base_prefs_test_support', 144 '../base/base.gyp:base_prefs_test_support',
131 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 145 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
132 '../crypto/crypto.gyp:crypto', 146 '../crypto/crypto.gyp:crypto',
133 '../crypto/crypto.gyp:crypto_test_support', 147 '../crypto/crypto.gyp:crypto_test_support',
(...skipping 1209 matching lines...) Expand 10 before | Expand all | Expand 10 after
1343 { # The same target as 'net', but with smaller binary size due to 1357 { # The same target as 'net', but with smaller binary size due to
1344 # exclusion of ICU, FTP, FILE and WebSockets support. 1358 # exclusion of ICU, FTP, FILE and WebSockets support.
1345 'target_name': 'net_small', 1359 'target_name': 'net_small',
1346 'variables': { 1360 'variables': {
1347 'disable_ftp_support': 1, 1361 'disable_ftp_support': 1,
1348 'disable_file_support': 1, 1362 'disable_file_support': 1,
1349 'enable_websockets': 0, 1363 'enable_websockets': 0,
1350 }, 1364 },
1351 'dependencies': [ 1365 'dependencies': [
1352 '../url/url.gyp:url_lib_use_icu_alternatives_on_android', 1366 '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
1367 'net_features',
1353 ], 1368 ],
1354 'defines': [ 1369 'defines': [
1355 'USE_ICU_ALTERNATIVES_ON_ANDROID=1', 1370 'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
1356 'DISABLE_FILE_SUPPORT=1', 1371 'DISABLE_FILE_SUPPORT=1',
1357 'DISABLE_FTP_SUPPORT=1', 1372 'DISABLE_FTP_SUPPORT=1',
1358 ], 1373 ],
1359 'sources': [ 1374 'sources': [
1360 'base/net_string_util_icu_alternatives_android.cc', 1375 'base/net_string_util_icu_alternatives_android.cc',
1361 'base/net_string_util_icu_alternatives_android.h', 1376 'base/net_string_util_icu_alternatives_android.h',
1362 ], 1377 ],
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
1698 '../build/isolate.gypi', 1713 '../build/isolate.gypi',
1699 ], 1714 ],
1700 'sources': [ 1715 'sources': [
1701 'net_unittests.isolate', 1716 'net_unittests.isolate',
1702 ], 1717 ],
1703 }, 1718 },
1704 ], 1719 ],
1705 }], 1720 }],
1706 ], 1721 ],
1707 } 1722 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698