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

Side by Side Diff: net/net.gyp

Issue 238633004: Remove all uses of toolkit_use_gtk in the gyp files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 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 | Annotate | Revision Log
« no previous file with comments | « media/media.gyp ('k') | printing/printing.gyp » ('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 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'use_tracing_cache_backend%': 0, 10 'use_tracing_cache_backend%': 0,
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 'ocsp/nss_ocsp.h', 293 'ocsp/nss_ocsp.h',
294 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 294 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
295 'third_party/mozilla_security_manager/nsKeygenHandler.h', 295 'third_party/mozilla_security_manager/nsKeygenHandler.h',
296 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 296 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
297 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 297 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
298 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 298 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
299 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 299 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
300 ], 300 ],
301 }, 301 },
302 ], 302 ],
303 [ 'toolkit_uses_gtk == 1', {
304 'dependencies': [
305 '../build/linux/system.gyp:gdk',
306 ],
307 }],
308 [ 'use_nss != 1', { 303 [ 'use_nss != 1', {
309 'sources!': [ 304 'sources!': [
310 'cert/cert_verify_proc_nss.cc', 305 'cert/cert_verify_proc_nss.cc',
311 'cert/cert_verify_proc_nss.h', 306 'cert/cert_verify_proc_nss.h',
312 'ssl/client_cert_store_nss.cc', 307 'ssl/client_cert_store_nss.cc',
313 'ssl/client_cert_store_nss.h', 308 'ssl/client_cert_store_nss.h',
314 'ssl/client_cert_store_chromeos.cc', 309 'ssl/client_cert_store_chromeos.cc',
315 'ssl/client_cert_store_chromeos.h', 310 'ssl/client_cert_store_chromeos.h',
316 ], 311 ],
317 }], 312 }],
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 'dependencies': [ 524 'dependencies': [
530 '../build/linux/system.gyp:ssl', 525 '../build/linux/system.gyp:ssl',
531 ], 526 ],
532 }, { # desktop_linux == 0 and chromeos == 0 527 }, { # desktop_linux == 0 and chromeos == 0
533 'sources!': [ 528 'sources!': [
534 'cert/nss_cert_database_unittest.cc', 529 'cert/nss_cert_database_unittest.cc',
535 ], 530 ],
536 }], 531 }],
537 ], 532 ],
538 }], 533 }],
539 [ 'toolkit_uses_gtk == 1', {
540 'dependencies': [
541 '../build/linux/system.gyp:gtk',
542 ],
543 },
544 ],
545 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { 534 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
546 'conditions': [ 535 'conditions': [
547 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 536 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
548 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', { 537 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
549 'dependencies': [ 538 'dependencies': [
550 '../base/allocator/allocator.gyp:allocator', 539 '../base/allocator/allocator.gyp:allocator',
551 ], 540 ],
552 }], 541 }],
553 ], 542 ],
554 }], 543 }],
(...skipping 990 matching lines...) Expand 10 before | Expand all | Expand 10 after
1545 'net_unittests.isolate', 1534 'net_unittests.isolate',
1546 ], 1535 ],
1547 'sources': [ 1536 'sources': [
1548 'net_unittests.isolate', 1537 'net_unittests.isolate',
1549 ], 1538 ],
1550 }, 1539 },
1551 ], 1540 ],
1552 }], 1541 }],
1553 ], 1542 ],
1554 } 1543 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | printing/printing.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698