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

Side by Side Diff: net/net.gyp

Issue 1839803002: Remove net & url small, iOS ICU alternatives, unit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 8 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
« no previous file with comments | « net/base/net_string_util_icu_alternatives_ios.mm ('k') | net/net_common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 'conditions': [ 9 'conditions': [
10 ['chromeos==1 or embedded==1 or OS=="ios"', { 10 ['chromeos==1 or embedded==1 or OS=="ios"', {
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 '../build/protoc.gypi', 99 '../build/protoc.gypi',
100 ], 100 ],
101 'defines': [ 101 'defines': [
102 'NET_IMPLEMENTATION', 102 'NET_IMPLEMENTATION',
103 ], 103 ],
104 }, 104 },
105 { 105 {
106 # GN version: //net 106 # GN version: //net
107 'target_name': 'net', 107 'target_name': 'net',
108 'dependencies': [ 108 'dependencies': [
109 '../base/base.gyp:base_i18n',
110 '../third_party/brotli/brotli.gyp:brotli',
111 '../third_party/icu/icu.gyp:icui18n',
112 '../third_party/icu/icu.gyp:icuuc',
113 '../third_party/protobuf/protobuf.gyp:protobuf_lite',
114 '../url/url.gyp:url_lib', 109 '../url/url.gyp:url_lib',
115 'net_quic_proto',
116 ],
117 'sources': [
118 'base/filename_util_icu.cc',
119 'base/net_string_util_icu.cc',
120 'filter/brotli_filter.cc',
121 ], 110 ],
122 'includes': [ 'net_common.gypi' ], 111 'includes': [ 'net_common.gypi' ],
112
113 'conditions': [
114 # ICU Alternatives
115 ['use_platform_icu_alternatives == 1', {
116 'conditions': [
117 ['OS == "android"', {
118 'sources': [
119 'base/net_string_util_icu_alternatives_android.cc',
120 'base/net_string_util_icu_alternatives_android.h',
121 ],
122 }],
123 ['OS == "ios"', {
124 'sources': [
125 'base/net_string_util_icu_alternatives_ios.mm',
126 ],
127 }],
128 ],
129 },
130 # 'use_platform_icu_alternatives != 1'
131 {
132 'sources': [
133 'base/filename_util_icu.cc',
134 'base/net_string_util_icu.cc',
135 ],
136 'dependencies': [
137 '../base/base.gyp:base_i18n',
138 '../third_party/icu/icu.gyp:icui18n',
139 '../third_party/icu/icu.gyp:icuuc',
140 '../third_party/protobuf/protobuf.gyp:protobuf_lite',
141 'net_quic_proto',
142 ],
143 }],
144 # Brotli support.
145 ['disable_brotli_filter == 1', {
146 'sources': [
147 'filter/brotli_filter_disabled.cc',
148 ],
149 },
150 # 'disable_brotli_filter != 1'
151 {
152 'sources': [
153 'filter/brotli_filter.cc',
154 ],
155 'dependencies': [
156 '../third_party/brotli/brotli.gyp:brotli',
157 ],
158 }],
159 ],
123 }, 160 },
124 { 161 {
125 # GN version: //net:net_unittests 162 # GN version: //net:net_unittests
126 'target_name': 'net_unittests', 163 'target_name': 'net_unittests',
127 'type': '<(gtest_target_type)', 164 'type': '<(gtest_target_type)',
128 'dependencies': [ 165 'dependencies': [
129 '../base/base.gyp:base', 166 '../base/base.gyp:base',
130 '../base/base.gyp:base_i18n', 167 '../base/base.gyp:base_i18n',
131 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 168 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
132 '../crypto/crypto.gyp:crypto', 169 '../crypto/crypto.gyp:crypto',
133 '../crypto/crypto.gyp:crypto_test_support', 170 '../crypto/crypto.gyp:crypto_test_support',
134 '../testing/gmock.gyp:gmock', 171 '../testing/gmock.gyp:gmock',
135 '../testing/gtest.gyp:gtest', 172 '../testing/gtest.gyp:gtest',
136 '../third_party/zlib/zlib.gyp:zlib', 173 '../third_party/zlib/zlib.gyp:zlib',
174 '../url/url.gyp:url_url_features',
137 '../url/url.gyp:url_lib', 175 '../url/url.gyp:url_lib',
138 'balsa', 176 'balsa',
139 'net', 177 'net',
140 'net_quic_proto', 178 'net_quic_proto',
141 'net_derived_sources', 179 'net_derived_sources',
142 'net_extras', 180 'net_extras',
143 'net_test_support', 181 'net_test_support',
144 'simple_quic_tools', 182 'simple_quic_tools',
145 'stale_while_revalidate_experiment_domains', 183 'stale_while_revalidate_experiment_domains',
146 ], 184 ],
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 }], 251 }],
214 [ 'use_kerberos==0 or OS == "android"', { 252 [ 'use_kerberos==0 or OS == "android"', {
215 # These are excluded on Android, because the actual Kerberos support, 253 # These are excluded on Android, because the actual Kerberos support,
216 # which these test, is in a separate app on Android. 254 # which these test, is in a separate app on Android.
217 'sources!': [ 255 'sources!': [
218 'http/http_auth_gssapi_posix_unittest.cc', 256 'http/http_auth_gssapi_posix_unittest.cc',
219 'http/mock_gssapi_library_posix.cc', 257 'http/mock_gssapi_library_posix.cc',
220 'http/mock_gssapi_library_posix.h', 258 'http/mock_gssapi_library_posix.h',
221 ], 259 ],
222 }], 260 }],
223 [ 'use_kerberos==0', { 261 [ 'use_kerberos==0', {
224 'sources!': [ 262 'sources!': [
225 'http/http_auth_handler_negotiate_unittest.cc', 263 'http/http_auth_handler_negotiate_unittest.cc',
226 ], 264 ],
227 }], 265 }],
228 [ 'use_nss_verifier == 0', { 266 [ 'use_nss_verifier == 0', {
229 # Only include this test when using NSS for cert verification. 267 # Only include this test when using NSS for cert verification.
230 'sources!': [ 268 'sources!': [
231 'cert_net/nss_ocsp_unittest.cc', 269 'cert_net/nss_ocsp_unittest.cc',
232 ], 270 ],
233 }], 271 }],
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 # icu. Figure out a way to remove that dependency. 452 # icu. Figure out a way to remove that dependency.
415 'dependencies': [ 453 'dependencies': [
416 '../testing/android/native_test.gyp:native_test_native_code', 454 '../testing/android/native_test.gyp:native_test_native_code',
417 ] 455 ]
418 }], 456 }],
419 ['use_v8_in_net==1 and v8_use_external_startup_data==1', { 457 ['use_v8_in_net==1 and v8_use_external_startup_data==1', {
420 'dependencies': [ 458 'dependencies': [
421 '../gin/gin.gyp:gin', 459 '../gin/gin.gyp:gin',
422 ] 460 ]
423 }], 461 }],
462 # Unit tests that are not supported by the current ICU alternatives on A ndroid.
463 ['OS == "android" and use_platform_icu_alternatives == 1', {
464 'sources!': [
465 'base/filename_util_unittest.cc',
466 'url_request/url_request_job_unittest.cc',
467 ],
468 }],
469 # Unit tests that are not supported by the current ICU alternatives on i OS.
470 ['OS == "ios" and use_platform_icu_alternatives == 1', {
471 'sources!': [
472 'base/filename_util_unittest.cc',
473 'base/url_util_unittest.cc',
474 'cert/x509_certificate_unittest.cc',
475 'socket/ssl_client_socket_pool_unittest.cc',
476 'http/http_auth_handler_basic_unittest.cc',
477 'http/http_auth_handler_digest_unittest.cc',
478 'http/http_auth_handler_factory_unittest.cc',
479 'http/http_auth_unittest.cc',
480 'http/http_content_disposition_unittest.cc',
481 'http/http_network_transaction_unittest.cc',
482 'http/http_proxy_client_socket_pool_unittest.cc',
483 'spdy/spdy_network_transaction_unittest.cc',
484 'spdy/spdy_proxy_client_socket_unittest.cc',
485 'url_request/url_request_job_unittest.cc',
486 'url_request/url_request_unittest.cc',
487 ],
488 }],
489 # Exclude brotli test if the support for brotli is disabled.
490 ['disable_brotli_filter == 1', {
491 'sources!': [
492 'filter/brotli_filter_unittest.cc',
493 ],
494 }],
424 ], 495 ],
425 'target_conditions': [ 496 'target_conditions': [
426 # These source files are excluded by default platform rules, but they 497 # These source files are excluded by default platform rules, but they
427 # are needed in specific cases on other platforms. Re-including them can 498 # are needed in specific cases on other platforms. Re-including them can
428 # only be done in target_conditions as it is evaluated after the 499 # only be done in target_conditions as it is evaluated after the
429 # platform rules. 500 # platform rules.
430 ['OS == "android"', { 501 ['OS == "android"', {
431 'sources/': [ 502 'sources/': [
432 ['include', '^base/address_tracker_linux_unittest\\.cc$'], 503 ['include', '^base/address_tracker_linux_unittest\\.cc$'],
433 ], 504 ],
(...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 'simple_quic_tools', 1372 'simple_quic_tools',
1302 ], 1373 ],
1303 'sources': [ 1374 'sources': [
1304 'tools/quic/quic_server_bin.cc', 1375 'tools/quic/quic_server_bin.cc',
1305 ], 1376 ],
1306 }, 1377 },
1307 ] 1378 ]
1308 }], 1379 }],
1309 ['OS=="android"', { 1380 ['OS=="android"', {
1310 'targets': [ 1381 'targets': [
1311 { # The same target as 'net', but with smaller binary size due to
1312 # exclusion of ICU, FTP, FILE and WebSockets support.
1313 'target_name': 'net_small',
1314 'variables': {
1315 'disable_ftp_support': 1,
1316 'disable_file_support': 1,
1317 'enable_websockets': 0,
1318 },
1319 'dependencies': [
1320 '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
1321 ],
1322 'defines': [
1323 'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
1324 'DISABLE_FILE_SUPPORT=1',
1325 'DISABLE_FTP_SUPPORT=1',
1326 ],
1327 'sources': [
1328 'filter/brotli_filter_disabled.cc',
1329 'base/net_string_util_icu_alternatives_android.cc',
1330 'base/net_string_util_icu_alternatives_android.h',
1331 ],
1332 'includes': [ 'net_common.gypi' ],
1333 },
1334 { 1382 {
1335 'target_name': 'net_jni_headers', 1383 'target_name': 'net_jni_headers',
1336 'type': 'none', 1384 'type': 'none',
1337 'sources': [ 1385 'sources': [
1338 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java', 1386 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java',
1339 'android/java/src/org/chromium/net/AndroidKeyStore.java', 1387 'android/java/src/org/chromium/net/AndroidKeyStore.java',
1340 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', 1388 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
1341 'android/java/src/org/chromium/net/AndroidTrafficStats.java', 1389 'android/java/src/org/chromium/net/AndroidTrafficStats.java',
1342 'android/java/src/org/chromium/net/GURLUtils.java', 1390 'android/java/src/org/chromium/net/GURLUtils.java',
1343 'android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java', 1391 'android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java',
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
1701 '../build/isolate.gypi', 1749 '../build/isolate.gypi',
1702 ], 1750 ],
1703 'sources': [ 1751 'sources': [
1704 'net_unittests.isolate', 1752 'net_unittests.isolate',
1705 ], 1753 ],
1706 }, 1754 },
1707 ], 1755 ],
1708 }], 1756 }],
1709 ], 1757 ],
1710 } 1758 }
OLDNEW
« no previous file with comments | « net/base/net_string_util_icu_alternatives_ios.mm ('k') | net/net_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698