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

Side by Side Diff: base/base.gypi

Issue 7550002: Clean up SSL false start blacklist code. Numerous changes, including: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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 | « base/base.gyp ('k') | base/third_party/dynamic_annotations/dynamic_annotations.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 (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'base_target': 0, 8 'base_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 ], 433 ],
434 }], 434 }],
435 ], 435 ],
436 }], 436 }],
437 ], 437 ],
438 }, 438 },
439 'targets': [ 439 'targets': [
440 { 440 {
441 'target_name': 'base', 441 'target_name': 'base',
442 'type': '<(component)', 442 'type': '<(component)',
443 'toolsets': ['host', 'target'],
443 'variables': { 444 'variables': {
444 'base_target': 1, 445 'base_target': 1,
445 }, 446 },
446 'dependencies': [ 447 'dependencies': [
447 'base_static', 448 'base_static',
448 '../third_party/modp_b64/modp_b64.gyp:modp_b64', 449 '../third_party/modp_b64/modp_b64.gyp:modp_b64',
449 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions', 450 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions',
450 ], 451 ],
451 # TODO(gregoryd): direct_dependent_settings should be shared with the 452 # TODO(gregoryd): direct_dependent_settings should be shared with the
452 # 64-bit target, but it doesn't work due to a bug in gyp 453 # 64-bit target, but it doesn't work due to a bug in gyp
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 }, 652 },
652 }, 653 },
653 }, 654 },
654 ], 655 ],
655 }], 656 }],
656 [ 'os_posix==1 and OS!="mac"', { 657 [ 'os_posix==1 and OS!="mac"', {
657 'targets': [ 658 'targets': [
658 { 659 {
659 'target_name': 'symbolize', 660 'target_name': 'symbolize',
660 'type': 'static_library', 661 'type': 'static_library',
662 'toolsets': ['host', 'target'],
661 'variables': { 663 'variables': {
662 'chromium_code': 0, 664 'chromium_code': 0,
663 }, 665 },
664 'conditions': [ 666 'conditions': [
665 [ 'OS == "solaris"', { 667 [ 'OS == "solaris"', {
666 'include_dirs': [ 668 'include_dirs': [
667 '/usr/gnu/include', 669 '/usr/gnu/include',
668 '/usr/gnu/include/libelf', 670 '/usr/gnu/include/libelf',
669 ], 671 ],
670 },], 672 },],
671 ], 673 ],
672 'cflags': [ 674 'cflags': [
673 '-Wno-sign-compare', 675 '-Wno-sign-compare',
674 ], 676 ],
675 'cflags!': [ 677 'cflags!': [
676 '-Wextra', 678 '-Wextra',
677 ], 679 ],
678 'sources': [ 680 'sources': [
679 'third_party/symbolize/symbolize.cc', 681 'third_party/symbolize/symbolize.cc',
680 'third_party/symbolize/demangle.cc', 682 'third_party/symbolize/demangle.cc',
681 ], 683 ],
682 }, 684 },
683 { 685 {
684 'target_name': 'xdg_mime', 686 'target_name': 'xdg_mime',
685 'type': 'static_library', 687 'type': 'static_library',
688 'toolsets': ['host', 'target'],
686 'variables': { 689 'variables': {
687 'chromium_code': 0, 690 'chromium_code': 0,
688 }, 691 },
689 'cflags!': [ 692 'cflags!': [
690 '-Wextra', 693 '-Wextra',
691 ], 694 ],
692 'sources': [ 695 'sources': [
693 'third_party/xdg_mime/xdgmime.c', 696 'third_party/xdg_mime/xdgmime.c',
694 'third_party/xdg_mime/xdgmime.h', 697 'third_party/xdg_mime/xdgmime.h',
695 'third_party/xdg_mime/xdgmimealias.c', 698 'third_party/xdg_mime/xdgmimealias.c',
696 'third_party/xdg_mime/xdgmimealias.h', 699 'third_party/xdg_mime/xdgmimealias.h',
697 'third_party/xdg_mime/xdgmimecache.c', 700 'third_party/xdg_mime/xdgmimecache.c',
698 'third_party/xdg_mime/xdgmimecache.h', 701 'third_party/xdg_mime/xdgmimecache.h',
699 'third_party/xdg_mime/xdgmimeglob.c', 702 'third_party/xdg_mime/xdgmimeglob.c',
700 'third_party/xdg_mime/xdgmimeglob.h', 703 'third_party/xdg_mime/xdgmimeglob.h',
701 'third_party/xdg_mime/xdgmimeicon.c', 704 'third_party/xdg_mime/xdgmimeicon.c',
702 'third_party/xdg_mime/xdgmimeicon.h', 705 'third_party/xdg_mime/xdgmimeicon.h',
703 'third_party/xdg_mime/xdgmimeint.c', 706 'third_party/xdg_mime/xdgmimeint.c',
704 'third_party/xdg_mime/xdgmimeint.h', 707 'third_party/xdg_mime/xdgmimeint.h',
705 'third_party/xdg_mime/xdgmimemagic.c', 708 'third_party/xdg_mime/xdgmimemagic.c',
706 'third_party/xdg_mime/xdgmimemagic.h', 709 'third_party/xdg_mime/xdgmimemagic.h',
707 'third_party/xdg_mime/xdgmimeparent.c', 710 'third_party/xdg_mime/xdgmimeparent.c',
708 'third_party/xdg_mime/xdgmimeparent.h', 711 'third_party/xdg_mime/xdgmimeparent.h',
709 ], 712 ],
710 }, 713 },
711 ], 714 ],
712 }], 715 }],
713 ], 716 ],
714 } 717 }
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | base/third_party/dynamic_annotations/dynamic_annotations.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698