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

Side by Side Diff: ui/ui.gyp

Issue 15102010: untangle pango usage from use_x11 and OS==linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove stray unit test inclusion (bad rebase?) Created 7 years, 7 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
« no previous file with comments | « content/content_common.gypi ('k') | ui/ui_unittests.gypi » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'includes': [ 9 'includes': [
10 'shell_dialogs.gypi', 10 'shell_dialogs.gypi',
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 '<(libjpeg_gyp_path):libjpeg', 575 '<(libjpeg_gyp_path):libjpeg',
576 ], 576 ],
577 }, { # OS=="ios" 577 }, { # OS=="ios"
578 # iOS only uses a subset of UI. 578 # iOS only uses a subset of UI.
579 'sources/': [ 579 'sources/': [
580 ['exclude', '\\.(cc|mm)$'], 580 ['exclude', '\\.(cc|mm)$'],
581 ['include', '_ios\\.(cc|mm)$'], 581 ['include', '_ios\\.(cc|mm)$'],
582 ['include', '(^|/)ios/'], 582 ['include', '(^|/)ios/'],
583 ['include', '^gfx/'], 583 ['include', '^gfx/'],
584 ['exclude', '^gfx/codec/jpeg_codec\\.cc$'], 584 ['exclude', '^gfx/codec/jpeg_codec\\.cc$'],
585 ['exclude', '^gfx/pango_util\\.'],
586 ['exclude', '^gfx/platform_font_pango\\.'],
587 ['include', '^base/animation/'], 585 ['include', '^base/animation/'],
588 ['include', '^base/l10n/'], 586 ['include', '^base/l10n/'],
589 ['include', '^base/layout'], 587 ['include', '^base/layout'],
590 ['include', '^base/range/'], 588 ['include', '^base/range/'],
591 ['include', '^base/resource/'], 589 ['include', '^base/resource/'],
592 ['include', '^base/text/text_elider\\.'], 590 ['include', '^base/text/text_elider\\.'],
593 ['include', '^base/ui_base_'], 591 ['include', '^base/ui_base_'],
594 ], 592 ],
595 'link_settings': { 593 'link_settings': {
596 'libraries': [ 594 'libraries': [
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 'base/cursor/cursor_win.cc', 632 'base/cursor/cursor_win.cc',
635 'base/cursor/cursor_x11.cc', 633 'base/cursor/cursor_x11.cc',
636 'base/x/selection_owner.cc', 634 'base/x/selection_owner.cc',
637 'base/x/selection_owner.h', 635 'base/x/selection_owner.h',
638 'base/x/selection_requestor.cc', 636 'base/x/selection_requestor.cc',
639 'base/x/selection_requestor.h', 637 'base/x/selection_requestor.h',
640 'base/x/selection_utils.cc', 638 'base/x/selection_utils.cc',
641 'base/x/selection_utils.h', 639 'base/x/selection_utils.h',
642 ] 640 ]
643 }], 641 }],
644 642 ['use_pango==0', {
643 'sources/': [
644 ['exclude', '^gfx/pango_util\\.'],
645 ['exclude', '^gfx/platform_font_pango\\.'],
646 ],
647 }],
645 ['use_aura==0 or OS!="linux"', { 648 ['use_aura==0 or OS!="linux"', {
646 'sources!': [ 649 'sources!': [
647 'base/resource/resource_bundle_auralinux.cc', 650 'base/resource/resource_bundle_auralinux.cc',
648 ], 651 ],
649 }], 652 }],
650 ['use_aura==1 and OS=="win"', { 653 ['use_aura==1 and OS=="win"', {
651 'sources/': [ 654 'sources/': [
652 ['exclude', 'base/dragdrop/drag_utils_aura.cc'], 655 ['exclude', 'base/dragdrop/drag_utils_aura.cc'],
653 ], 656 ],
654 }], 657 }],
655 ['use_aura==0 and toolkit_views==0', { 658 ['use_aura==0 and toolkit_views==0', {
656 'sources/': [ 659 'sources/': [
657 ['exclude', '^base/gestures/*'], 660 ['exclude', '^base/gestures/*'],
658 ] 661 ]
659 }], 662 }],
660 ['use_glib == 1', { 663 ['use_glib == 1', {
661 'dependencies': [ 664 'dependencies': [
662 # font_gtk.cc uses fontconfig. 665 # font_gtk.cc uses fontconfig.
663 '../build/linux/system.gyp:fontconfig', 666 '../build/linux/system.gyp:fontconfig',
664 '../build/linux/system.gyp:glib', 667 '../build/linux/system.gyp:glib',
665 '../build/linux/system.gyp:pangocairo',
666 ], 668 ],
667 'conditions': [ 669 'conditions': [
668 ['toolkit_views==0', { 670 ['toolkit_views==0', {
669 # Note: because of gyp predence rules this has to be defined as 671 # Note: because of gyp predence rules this has to be defined as
670 # 'sources/' rather than 'sources!'. 672 # 'sources/' rather than 'sources!'.
671 'sources/': [ 673 'sources/': [
672 ['exclude', '^base/dragdrop/drag_utils.cc'], 674 ['exclude', '^base/dragdrop/drag_utils.cc'],
673 ['exclude', '^base/dragdrop/drag_utils.h'], 675 ['exclude', '^base/dragdrop/drag_utils.h'],
674 ['exclude', '^base/dragdrop/os_exchange_data.cc'], 676 ['exclude', '^base/dragdrop/os_exchange_data.cc'],
675 ['exclude', '^base/dragdrop/os_exchange_data.h'], 677 ['exclude', '^base/dragdrop/os_exchange_data.h'],
676 ], 678 ],
677 }, { 679 }, {
678 # Note: because of gyp predence rules this has to be defined as 680 # Note: because of gyp predence rules this has to be defined as
679 # 'sources/' rather than 'sources!'. 681 # 'sources/' rather than 'sources!'.
680 'sources/': [ 682 'sources/': [
681 ['include', '^base/dragdrop/os_exchange_data.cc'], 683 ['include', '^base/dragdrop/os_exchange_data.cc'],
682 ], 684 ],
683 }], 685 }],
686 ['use_pango==1', {
687 'dependencies': [
688 '../build/linux/system.gyp:pangocairo',
689 ],
690 }],
684 ], 691 ],
685 }], 692 }],
686 ['toolkit_uses_gtk == 1', { 693 ['toolkit_uses_gtk == 1', {
687 'dependencies': [ 694 'dependencies': [
688 '../build/linux/system.gyp:gtk', 695 '../build/linux/system.gyp:gtk',
689 ], 696 ],
690 'sources': [ 697 'sources': [
691 'gfx/gtk_native_view_id_manager.cc', 698 'gfx/gtk_native_view_id_manager.cc',
692 'gfx/gtk_native_view_id_manager.h', 699 'gfx/gtk_native_view_id_manager.h',
693 'gfx/gtk_preserve_window.cc', 700 'gfx/gtk_preserve_window.cc',
(...skipping 20 matching lines...) Expand all
714 }], 721 }],
715 ['OS=="win"', { 722 ['OS=="win"', {
716 'sources': [ 723 'sources': [
717 'gfx/gdi_util.cc', 724 'gfx/gdi_util.cc',
718 'gfx/gdi_util.h', 725 'gfx/gdi_util.h',
719 'gfx/icon_util.cc', 726 'gfx/icon_util.cc',
720 'gfx/icon_util.h', 727 'gfx/icon_util.h',
721 ], 728 ],
722 'sources!': [ 729 'sources!': [
723 'base/touch/touch_device.cc', 730 'base/touch/touch_device.cc',
724 'gfx/pango_util.h',
725 'gfx/pango_util.cc',
726 'gfx/platform_font_pango.cc',
727 'gfx/platform_font_pango.h',
728 ], 731 ],
729 'include_dirs': [ 732 'include_dirs': [
730 '../', 733 '../',
731 '../third_party/wtl/include', 734 '../third_party/wtl/include',
732 ], 735 ],
733 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int 736 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int
734 # C4324 is structure was padded due to __declspec(align()), which is 737 # C4324 is structure was padded due to __declspec(align()), which is
735 # uninteresting. 738 # uninteresting.
736 'msvs_disabled_warnings': [ 4267, 4324 ], 739 'msvs_disabled_warnings': [ 4267, 4324 ],
737 'msvs_settings': { 740 'msvs_settings': {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 'base/dragdrop/os_exchange_data.cc', 773 'base/dragdrop/os_exchange_data.cc',
771 ], 774 ],
772 'sources/': [ 775 'sources/': [
773 ['exclude', '^base/win/'], 776 ['exclude', '^base/win/'],
774 ], 777 ],
775 }], 778 }],
776 ['OS=="mac"', { 779 ['OS=="mac"', {
777 'sources!': [ 780 'sources!': [
778 'base/dragdrop/drag_utils.cc', 781 'base/dragdrop/drag_utils.cc',
779 'base/dragdrop/drag_utils.h', 782 'base/dragdrop/drag_utils.h',
780 'gfx/pango_util.h',
781 'gfx/pango_util.cc',
782 'gfx/platform_font_pango.h',
783 'gfx/platform_font_pango.cc',
784 ], 783 ],
785 'link_settings': { 784 'link_settings': {
786 'libraries': [ 785 'libraries': [
787 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', 786 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
788 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', 787 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
789 '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework', 788 '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
790 ], 789 ],
791 }, 790 },
792 }], 791 }],
793 ['use_x11==1', { 792 ['use_x11==1', {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
843 'base/events/key_identifier_conversion.cc', 842 'base/events/key_identifier_conversion.cc',
844 'base/events/key_identifier_conversion.h', 843 'base/events/key_identifier_conversion.h',
845 'base/x/events_x.cc', 844 'base/x/events_x.cc',
846 ], 845 ],
847 }], 846 }],
848 ['OS=="android"', { 847 ['OS=="android"', {
849 'sources!': [ 848 'sources!': [
850 'base/dragdrop/drag_utils.cc', 849 'base/dragdrop/drag_utils.cc',
851 'base/dragdrop/drag_utils.h', 850 'base/dragdrop/drag_utils.h',
852 'base/touch/touch_device.cc', 851 'base/touch/touch_device.cc',
853 'gfx/pango_util.cc',
854 'gfx/pango_util.h',
855 'gfx/platform_font_pango.cc',
856 'gfx/platform_font_pango.h',
857 ], 852 ],
858 'dependencies': [ 853 'dependencies': [
859 'ui_jni_headers', 854 'ui_jni_headers',
860 ], 855 ],
861 'include_dirs': [ 856 'include_dirs': [
862 '<(SHARED_INTERMEDIATE_DIR)/ui', 857 '<(SHARED_INTERMEDIATE_DIR)/ui',
863 ], 858 ],
864 'link_settings': { 859 'link_settings': {
865 'libraries': [ 860 'libraries': [
866 '-ljnigraphics', 861 '-ljnigraphics',
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
999 'xcode_settings': { 994 'xcode_settings': {
1000 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', 995 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
1001 }, 996 },
1002 }], 997 }],
1003 ], 998 ],
1004 }, 999 },
1005 ], 1000 ],
1006 }], 1001 }],
1007 ], 1002 ],
1008 } 1003 }
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698