OLD | NEW |
---|---|
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
7 import("//testing/test.gni") | 7 import("//testing/test.gni") |
8 import("//ui/base/ui_features.gni") | 8 import("//ui/base/ui_features.gni") |
9 import("//ui/ozone/ozone.gni") | 9 import("//ui/ozone/ozone.gni") |
10 import("//ui/vector_icons/vector_icons.gni") | 10 import("//ui/vector_icons/vector_icons.gni") |
(...skipping 13 matching lines...) Expand all Loading... | |
24 "menu_radio_empty.icon", | 24 "menu_radio_empty.icon", |
25 "menu_radio_selected.icon", | 25 "menu_radio_selected.icon", |
26 "radio_button_active.icon", | 26 "radio_button_active.icon", |
27 "radio_button_normal.icon", | 27 "radio_button_normal.icon", |
28 "submenu_arrow.1x.icon", | 28 "submenu_arrow.1x.icon", |
29 "submenu_arrow.icon", | 29 "submenu_arrow.icon", |
30 ] | 30 ] |
31 } | 31 } |
32 | 32 |
33 component("views") { | 33 component("views") { |
34 allow_circular_includes_from = [ ":views_internal" ] | |
34 all_dependent_configs = [ ":flags" ] | 35 all_dependent_configs = [ ":flags" ] |
35 sources = [ | 36 sources = [ |
36 "accessibility/native_view_accessibility.h", | 37 "accessibility/native_view_accessibility.h", |
37 "accessible_pane_view.cc", | 38 "accessible_pane_view.cc", |
38 "accessible_pane_view.h", | 39 "accessible_pane_view.h", |
39 "animation/bounds_animator.cc", | 40 "animation/bounds_animator.cc", |
40 "animation/bounds_animator.h", | 41 "animation/bounds_animator.h", |
41 "animation/bounds_animator_observer.h", | 42 "animation/bounds_animator_observer.h", |
42 "animation/flood_fill_ink_drop_ripple.cc", | 43 "animation/flood_fill_ink_drop_ripple.cc", |
43 "animation/flood_fill_ink_drop_ripple.h", | 44 "animation/flood_fill_ink_drop_ripple.h", |
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
405 configs += [ | 406 configs += [ |
406 "//build/config:precompiled_headers", | 407 "//build/config:precompiled_headers", |
407 | 408 |
408 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 409 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
409 "//build/config/compiler:no_size_t_to_int_warning", | 410 "//build/config/compiler:no_size_t_to_int_warning", |
410 ] | 411 ] |
411 | 412 |
412 defines = [ "VIEWS_IMPLEMENTATION" ] | 413 defines = [ "VIEWS_IMPLEMENTATION" ] |
413 | 414 |
414 deps = [ | 415 deps = [ |
416 ":views_internal", | |
415 ":views_vector_icons", | 417 ":views_vector_icons", |
416 "//base:i18n", | 418 "//base:i18n", |
417 "//base/third_party/dynamic_annotations", | 419 "//base/third_party/dynamic_annotations", |
418 "//cc/paint", | 420 "//cc/paint", |
419 "//services/ui/public/interfaces", | 421 "//services/ui/public/interfaces", |
420 "//skia", | 422 "//skia", |
421 "//third_party/icu", | 423 "//third_party/icu", |
422 "//ui/accessibility", | 424 "//ui/accessibility", |
423 "//ui/display", | 425 "//ui/display", |
424 "//ui/native_theme", | 426 "//ui/native_theme", |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
660 "accessibility/native_view_accessibility_mac.h", | 662 "accessibility/native_view_accessibility_mac.h", |
661 "accessibility/native_view_accessibility_mac.mm", | 663 "accessibility/native_view_accessibility_mac.mm", |
662 "accessibility/native_view_accessibility_win.cc", | 664 "accessibility/native_view_accessibility_win.cc", |
663 "accessibility/native_view_accessibility_win.h", | 665 "accessibility/native_view_accessibility_win.h", |
664 ] | 666 ] |
665 } else { | 667 } else { |
666 sources += [ "accessibility/native_view_accessibility_stub.cc" ] | 668 sources += [ "accessibility/native_view_accessibility_stub.cc" ] |
667 } | 669 } |
668 } | 670 } |
669 | 671 |
672 static_library("views_internal") { | |
sky
2017/06/08 19:06:14
This seems overly complex, but I could certainly b
| |
673 # External code should depend upon "views". | |
674 visibility = [ "./*" ] | |
675 | |
676 sources = [ | |
677 "controls/button/label_button_label.cc", | |
678 "controls/button/label_button_label.h", | |
679 ] | |
680 | |
681 defines = [ "VIEWS_IMPLEMENTATION" ] | |
682 | |
683 deps = [ | |
684 "//base", | |
685 "//skia:skia", | |
686 "//ui/accessibility:ax_gen", | |
687 "//ui/gfx", | |
688 ] | |
689 } | |
690 | |
691 # Lists headers in :views_internal that are used in :views_unittests. This is | |
692 # needed to satisfy gn check because :views_unittests can't depend on both | |
693 # :views and :views_internal without linking in :views_internal twice and | |
694 # causing duplicate symbols. This happens because when :views is a DLL and | |
695 # :views_internal is a static library, the usual symbol resolution breaks. | |
696 source_set("test_headers") { | |
697 visibility = [ "./*" ] | |
698 check_includes = false # Deps are checked in :views_internal. | |
699 | |
700 sources = [ | |
701 "controls/button/label_button_label.h", | |
brettw
2017/06/13 22:33:57
What's the ever higher level goal here? You want v
tapted
2017/06/14 09:14:09
Yup - exactly.
| |
702 ] | |
703 } | |
tapted
2017/06/08 04:11:32
You can see the other things I attempted in earlie
| |
704 | |
670 static_library("test_support_internal") { | 705 static_library("test_support_internal") { |
671 testonly = true | 706 testonly = true |
672 sources = [ | 707 sources = [ |
673 "animation/test/flood_fill_ink_drop_ripple_test_api.cc", | 708 "animation/test/flood_fill_ink_drop_ripple_test_api.cc", |
674 "animation/test/flood_fill_ink_drop_ripple_test_api.h", | 709 "animation/test/flood_fill_ink_drop_ripple_test_api.h", |
675 "animation/test/ink_drop_highlight_test_api.cc", | 710 "animation/test/ink_drop_highlight_test_api.cc", |
676 "animation/test/ink_drop_highlight_test_api.h", | 711 "animation/test/ink_drop_highlight_test_api.h", |
677 "animation/test/ink_drop_host_view_test_api.cc", | 712 "animation/test/ink_drop_host_view_test_api.cc", |
678 "animation/test/ink_drop_host_view_test_api.h", | 713 "animation/test/ink_drop_host_view_test_api.h", |
679 "animation/test/ink_drop_impl_test_api.cc", | 714 "animation/test/ink_drop_impl_test_api.cc", |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
850 "bubble/bubble_dialog_delegate_unittest.cc", | 885 "bubble/bubble_dialog_delegate_unittest.cc", |
851 "bubble/bubble_frame_view_unittest.cc", | 886 "bubble/bubble_frame_view_unittest.cc", |
852 "bubble/bubble_window_targeter_unittest.cc", | 887 "bubble/bubble_window_targeter_unittest.cc", |
853 "cocoa/bridged_native_widget_unittest.mm", | 888 "cocoa/bridged_native_widget_unittest.mm", |
854 "cocoa/cocoa_mouse_capture_unittest.mm", | 889 "cocoa/cocoa_mouse_capture_unittest.mm", |
855 "cocoa/drag_drop_client_mac_unittest.mm", | 890 "cocoa/drag_drop_client_mac_unittest.mm", |
856 "controls/button/blue_button_unittest.cc", | 891 "controls/button/blue_button_unittest.cc", |
857 "controls/button/custom_button_unittest.cc", | 892 "controls/button/custom_button_unittest.cc", |
858 "controls/button/image_button_factory_unittest.cc", | 893 "controls/button/image_button_factory_unittest.cc", |
859 "controls/button/image_button_unittest.cc", | 894 "controls/button/image_button_unittest.cc", |
895 "controls/button/label_button_label_unittest.cc", | |
860 "controls/button/label_button_unittest.cc", | 896 "controls/button/label_button_unittest.cc", |
861 "controls/button/menu_button_unittest.cc", | 897 "controls/button/menu_button_unittest.cc", |
862 "controls/button/toggle_button_unittest.cc", | 898 "controls/button/toggle_button_unittest.cc", |
863 "controls/combobox/combobox_unittest.cc", | 899 "controls/combobox/combobox_unittest.cc", |
864 "controls/label_unittest.cc", | 900 "controls/label_unittest.cc", |
865 "controls/menu/menu_controller_unittest.cc", | 901 "controls/menu/menu_controller_unittest.cc", |
866 "controls/menu/menu_item_view_unittest.cc", | 902 "controls/menu/menu_item_view_unittest.cc", |
867 "controls/menu/menu_model_adapter_unittest.cc", | 903 "controls/menu/menu_model_adapter_unittest.cc", |
868 "controls/menu/menu_runner_cocoa_unittest.mm", | 904 "controls/menu/menu_runner_cocoa_unittest.mm", |
869 "controls/menu/menu_runner_unittest.cc", | 905 "controls/menu/menu_runner_unittest.cc", |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
908 "window/custom_frame_view_unittest.cc", | 944 "window/custom_frame_view_unittest.cc", |
909 "window/dialog_client_view_unittest.cc", | 945 "window/dialog_client_view_unittest.cc", |
910 "window/dialog_delegate_unittest.cc", | 946 "window/dialog_delegate_unittest.cc", |
911 ] | 947 ] |
912 | 948 |
913 configs += [ "//build/config:precompiled_headers" ] | 949 configs += [ "//build/config:precompiled_headers" ] |
914 | 950 |
915 # Make all deps in this target public so both views_unittests and | 951 # Make all deps in this target public so both views_unittests and |
916 # views_mus_unittests will get them. | 952 # views_mus_unittests will get them. |
917 public_deps = [ | 953 public_deps = [ |
954 ":test_headers", | |
918 ":test_support", | 955 ":test_support", |
956 ":views", | |
tapted
2017/06/08 04:11:32
One problem with the approach used by ":test_suppo
| |
919 "//base", | 957 "//base", |
920 "//base:i18n", | 958 "//base:i18n", |
921 "//base/test:test_support", | 959 "//base/test:test_support", |
922 "//cc", | 960 "//cc", |
923 "//cc/paint", | 961 "//cc/paint", |
924 "//services/ui/public/interfaces", | 962 "//services/ui/public/interfaces", |
925 "//skia", | 963 "//skia", |
926 "//testing/gtest", | 964 "//testing/gtest", |
927 "//third_party/icu", | 965 "//third_party/icu", |
928 "//ui/accessibility", | 966 "//ui/accessibility", |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1074 "//ui/base:test_support", | 1112 "//ui/base:test_support", |
1075 "//ui/compositor", | 1113 "//ui/compositor", |
1076 "//ui/events:test_support", | 1114 "//ui/events:test_support", |
1077 "//ui/gl:test_support", | 1115 "//ui/gl:test_support", |
1078 "//ui/resources", | 1116 "//ui/resources", |
1079 "//ui/resources:ui_test_pak", | 1117 "//ui/resources:ui_test_pak", |
1080 "//ui/strings", | 1118 "//ui/strings", |
1081 ] | 1119 ] |
1082 } | 1120 } |
1083 } | 1121 } |
OLD | NEW |