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

Side by Side Diff: base/base.gypi

Issue 7587003: Revert 95910 - Revert 95907 - Clean up SSL false start blacklist code. (Closed) Base URL: svn://svn.chromium.org/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 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 ], 439 ],
440 }], 440 }],
441 ], 441 ],
442 }], 442 }],
443 ], 443 ],
444 }, 444 },
445 'targets': [ 445 'targets': [
446 { 446 {
447 'target_name': 'base', 447 'target_name': 'base',
448 'type': '<(component)', 448 'type': '<(component)',
449 'toolsets': ['host', 'target'],
449 'variables': { 450 'variables': {
450 'base_target': 1, 451 'base_target': 1,
451 }, 452 },
452 'dependencies': [ 453 'dependencies': [
453 'base_static', 454 'base_static',
454 '../third_party/modp_b64/modp_b64.gyp:modp_b64', 455 '../third_party/modp_b64/modp_b64.gyp:modp_b64',
455 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions', 456 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions',
456 ], 457 ],
457 # TODO(gregoryd): direct_dependent_settings should be shared with the 458 # TODO(gregoryd): direct_dependent_settings should be shared with the
458 # 64-bit target, but it doesn't work due to a bug in gyp 459 # 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
657 }, 658 },
658 }, 659 },
659 }, 660 },
660 ], 661 ],
661 }], 662 }],
662 [ 'os_posix==1 and OS!="mac"', { 663 [ 'os_posix==1 and OS!="mac"', {
663 'targets': [ 664 'targets': [
664 { 665 {
665 'target_name': 'symbolize', 666 'target_name': 'symbolize',
666 'type': 'static_library', 667 'type': 'static_library',
668 'toolsets': ['host', 'target'],
667 'variables': { 669 'variables': {
668 'chromium_code': 0, 670 'chromium_code': 0,
669 }, 671 },
670 'conditions': [ 672 'conditions': [
671 [ 'OS == "solaris"', { 673 [ 'OS == "solaris"', {
672 'include_dirs': [ 674 'include_dirs': [
673 '/usr/gnu/include', 675 '/usr/gnu/include',
674 '/usr/gnu/include/libelf', 676 '/usr/gnu/include/libelf',
675 ], 677 ],
676 },], 678 },],
677 ], 679 ],
678 'cflags': [ 680 'cflags': [
679 '-Wno-sign-compare', 681 '-Wno-sign-compare',
680 ], 682 ],
681 'cflags!': [ 683 'cflags!': [
682 '-Wextra', 684 '-Wextra',
683 ], 685 ],
684 'sources': [ 686 'sources': [
685 'third_party/symbolize/symbolize.cc', 687 'third_party/symbolize/symbolize.cc',
686 'third_party/symbolize/demangle.cc', 688 'third_party/symbolize/demangle.cc',
687 ], 689 ],
688 }, 690 },
689 { 691 {
690 'target_name': 'xdg_mime', 692 'target_name': 'xdg_mime',
691 'type': 'static_library', 693 'type': 'static_library',
694 'toolsets': ['host', 'target'],
692 'variables': { 695 'variables': {
693 'chromium_code': 0, 696 'chromium_code': 0,
694 }, 697 },
695 'cflags!': [ 698 'cflags!': [
696 '-Wextra', 699 '-Wextra',
697 ], 700 ],
698 'sources': [ 701 'sources': [
699 'third_party/xdg_mime/xdgmime.c', 702 'third_party/xdg_mime/xdgmime.c',
700 'third_party/xdg_mime/xdgmime.h', 703 'third_party/xdg_mime/xdgmime.h',
701 'third_party/xdg_mime/xdgmimealias.c', 704 'third_party/xdg_mime/xdgmimealias.c',
702 'third_party/xdg_mime/xdgmimealias.h', 705 'third_party/xdg_mime/xdgmimealias.h',
703 'third_party/xdg_mime/xdgmimecache.c', 706 'third_party/xdg_mime/xdgmimecache.c',
704 'third_party/xdg_mime/xdgmimecache.h', 707 'third_party/xdg_mime/xdgmimecache.h',
705 'third_party/xdg_mime/xdgmimeglob.c', 708 'third_party/xdg_mime/xdgmimeglob.c',
706 'third_party/xdg_mime/xdgmimeglob.h', 709 'third_party/xdg_mime/xdgmimeglob.h',
707 'third_party/xdg_mime/xdgmimeicon.c', 710 'third_party/xdg_mime/xdgmimeicon.c',
708 'third_party/xdg_mime/xdgmimeicon.h', 711 'third_party/xdg_mime/xdgmimeicon.h',
709 'third_party/xdg_mime/xdgmimeint.c', 712 'third_party/xdg_mime/xdgmimeint.c',
710 'third_party/xdg_mime/xdgmimeint.h', 713 'third_party/xdg_mime/xdgmimeint.h',
711 'third_party/xdg_mime/xdgmimemagic.c', 714 'third_party/xdg_mime/xdgmimemagic.c',
712 'third_party/xdg_mime/xdgmimemagic.h', 715 'third_party/xdg_mime/xdgmimemagic.h',
713 'third_party/xdg_mime/xdgmimeparent.c', 716 'third_party/xdg_mime/xdgmimeparent.c',
714 'third_party/xdg_mime/xdgmimeparent.h', 717 'third_party/xdg_mime/xdgmimeparent.h',
715 ], 718 ],
716 }, 719 },
717 ], 720 ],
718 }], 721 }],
719 ], 722 ],
720 } 723 }
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