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

Side by Side Diff: base/base.gypi

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