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

Side by Side Diff: net/net.gyp

Issue 117533003: Make the blockfile cache an optional build product for chrome target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to upstream patch 17 Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « net/disk_cache/cache_creator.cc ('k') | no next file » | 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 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'use_blockfile_cache_backend%': 1,
gavinp 2014/02/05 20:54:13 In the upstream review, there was some discussion
10 'use_tracing_cache_backend%': 0, 11 'use_tracing_cache_backend%': 0,
11 'conditions': [ 12 'conditions': [
12 ['chromeos==1 or embedded==1 or OS=="android" or OS=="ios"', { 13 ['chromeos==1 or embedded==1 or OS=="android" or OS=="ios"', {
13 # Disable Kerberos on ChromeOS, Android and iOS, at least for now. 14 # Disable Kerberos on ChromeOS, Android and iOS, at least for now.
14 # It needs configuration (krb5.conf and so on). 15 # It needs configuration (krb5.conf and so on).
15 'use_kerberos%': 0, 16 'use_kerberos%': 0,
16 }, { # chromeos == 0 and embedded==0 and OS!="android" and OS!="ios" 17 }, { # chromeos == 0 and embedded==0 and OS!="android" and OS!="ios"
17 'use_kerberos%': 1, 18 'use_kerberos%': 1,
18 }], 19 }],
19 ['OS=="android" and target_arch != "ia32"', { 20 ['OS=="android" and target_arch != "ia32"', {
(...skipping 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after
1325 'defines': [ 1326 'defines': [
1326 'ENABLE_BUILT_IN_DNS', 1327 'ENABLE_BUILT_IN_DNS',
1327 ] 1328 ]
1328 }, { # else 1329 }, { # else
1329 'sources!': [ 1330 'sources!': [
1330 'dns/address_sorter_posix.cc', 1331 'dns/address_sorter_posix.cc',
1331 'dns/address_sorter_posix.h', 1332 'dns/address_sorter_posix.h',
1332 'dns/dns_client.cc', 1333 'dns/dns_client.cc',
1333 ], 1334 ],
1334 }], 1335 }],
1336 ['use_blockfile_cache_backend==1', {
1337 'defines': [
1338 'USE_BLOCKFILE_CACHE_BACKEND',
1339 ],
1340 }, { # use_blockfile_cache_backend == 0
1341 'sources/': [ ['exclude', '^disk_cache/v[23]/' ] ]
1342 }],
1335 ['use_tracing_cache_backend==1', { 1343 ['use_tracing_cache_backend==1', {
1336 'defines': [ 1344 'defines': [
1337 'USE_TRACING_CACHE_BACKEND' 1345 'USE_TRACING_CACHE_BACKEND'
1338 ], 1346 ],
1339 }], 1347 }],
1340 ['use_openssl==1', { 1348 ['use_openssl==1', {
1341 'sources!': [ 1349 'sources!': [
1342 'base/crypto_module_nss.cc', 1350 'base/crypto_module_nss.cc',
1343 'base/keygen_handler_nss.cc', 1351 'base/keygen_handler_nss.cc',
1344 'base/nss_memio.c', 1352 'base/nss_memio.c',
1345 'base/nss_memio.h', 1353 'base/nss_memio.h',
1346 'cert/cert_database_nss.cc', 1354 'cert/cert_database_nss.cc',
1347 'cert/cert_verify_proc_nss.cc', 1355 'cert/cert_verify_proc_nss.cc',
1348 'cert/cert_verify_proc_nss.h', 1356 'cert/cert_verify_proc_nss.h',
1349 'cert/ct_log_verifier_nss.cc', 1357 'cert/ct_log_verifier_nss.cc',
(...skipping 1827 matching lines...) Expand 10 before | Expand all | Expand 10 after
3177 'net_unittests.isolate', 3185 'net_unittests.isolate',
3178 ], 3186 ],
3179 'sources': [ 3187 'sources': [
3180 'net_unittests.isolate', 3188 'net_unittests.isolate',
3181 ], 3189 ],
3182 }, 3190 },
3183 ], 3191 ],
3184 }], 3192 }],
3185 ], 3193 ],
3186 } 3194 }
OLDNEW
« no previous file with comments | « net/disk_cache/cache_creator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698