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

Side by Side Diff: ui/base/BUILD.gn

Issue 1206033005: Rework how isolates are generated in MB. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up osmesa, add comments about ui_test_pak Created 5 years, 5 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 | « tools/mb/mb.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ui.gni") 5 import("//build/config/ui.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 if (is_android) { 8 if (is_android) {
9 import("//build/config/android/config.gni") 9 import("//build/config/android/config.gni")
10 import("//build/config/android/rules.gni") 10 import("//build/config/android/rules.gni")
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 "../android/java/src/org/chromium/ui/base/DeviceFormFactor.java", 620 "../android/java/src/org/chromium/ui/base/DeviceFormFactor.java",
621 "../android/java/src/org/chromium/ui/base/LocalizationUtils.java", 621 "../android/java/src/org/chromium/ui/base/LocalizationUtils.java",
622 "../android/java/src/org/chromium/ui/base/ResourceBundle.java", 622 "../android/java/src/org/chromium/ui/base/ResourceBundle.java",
623 "../android/java/src/org/chromium/ui/base/SelectFileDialog.java", 623 "../android/java/src/org/chromium/ui/base/SelectFileDialog.java",
624 "../android/java/src/org/chromium/ui/base/TouchDevice.java", 624 "../android/java/src/org/chromium/ui/base/TouchDevice.java",
625 ] 625 ]
626 jni_package = "base" 626 jni_package = "base"
627 } 627 }
628 } 628 }
629 629
630 #
631 # TODO(GYP): Delete this after we've converted everything to GN.
632 # The _run targets exist only for compatibility w/ GYP.
633 group("ui_base_unittests_run") {
634 testonly = true
635 deps = [
636 ":ui_base_unittests",
637 ]
638 }
639
630 # GYP version: ui/base/ui_base_tests.gyp:ui_base_unittests 640 # GYP version: ui/base/ui_base_tests.gyp:ui_base_unittests
631 test("ui_base_unittests") { 641 test("ui_base_unittests") {
632 sources = [ 642 sources = [
633 "ios/cru_context_menu_controller_unittest.mm", 643 "ios/cru_context_menu_controller_unittest.mm",
634 "l10n/l10n_util_mac_unittest.mm", 644 "l10n/l10n_util_mac_unittest.mm",
635 "l10n/l10n_util_unittest.cc", 645 "l10n/l10n_util_unittest.cc",
636 "l10n/l10n_util_win_unittest.cc", 646 "l10n/l10n_util_win_unittest.cc",
637 "l10n/time_format_unittest.cc", 647 "l10n/time_format_unittest.cc",
638 "layout_unittest.cc", 648 "layout_unittest.cc",
639 "models/tree_node_iterator_unittest.cc", 649 "models/tree_node_iterator_unittest.cc",
640 "resource/data_pack_literal.cc", 650 "resource/data_pack_literal.cc",
641 "resource/data_pack_unittest.cc", 651 "resource/data_pack_unittest.cc",
642 "resource/material_design/material_design_controller_unittest.cc", 652 "resource/material_design/material_design_controller_unittest.cc",
643 "resource/resource_bundle_unittest.cc", 653 "resource/resource_bundle_unittest.cc",
644 "template_expressions_unittest.cc", 654 "template_expressions_unittest.cc",
645 "test/run_all_unittests.cc", 655 "test/run_all_unittests.cc",
646 "test/scoped_fake_nswindow_fullscreen_unittest.mm", 656 "test/scoped_fake_nswindow_fullscreen_unittest.mm",
647 "test/test_clipboard_unittest.cc", 657 "test/test_clipboard_unittest.cc",
648 "user_activity/user_activity_detector_unittest.cc", 658 "user_activity/user_activity_detector_unittest.cc",
649 ] 659 ]
650 660
661 data = []
662 data_deps = []
663
651 if (is_android) { 664 if (is_android) {
652 sources -= [ "user_activity/user_activity_detector_unittest.cc" ] 665 sources -= [ "user_activity/user_activity_detector_unittest.cc" ]
653 } 666 }
654 667
655 if (is_ios) { 668 if (is_ios) {
656 # Compile this Mac file on iOS as well. 669 # Compile this Mac file on iOS as well.
657 set_sources_assignment_filter([]) 670 set_sources_assignment_filter([])
658 sources += [ "l10n/l10n_util_mac_unittest.mm" ] 671 sources += [ "l10n/l10n_util_mac_unittest.mm" ]
659 set_sources_assignment_filter(sources_assignment_filter) 672 set_sources_assignment_filter(sources_assignment_filter)
660 } else { # !is_ios 673 } else { # !is_ios
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 if (use_x11) { 790 if (use_x11) {
778 sources += [ "cursor/cursor_loader_x11_unittest.cc" ] 791 sources += [ "cursor/cursor_loader_x11_unittest.cc" ]
779 792
780 configs += [ "//build/config/linux:x11" ] 793 configs += [ "//build/config/linux:x11" ]
781 794
782 deps += [ 795 deps += [
783 "//ui/events/platform/x11", 796 "//ui/events/platform/x11",
784 "//ui/gfx/x", 797 "//ui/gfx/x",
785 ] 798 ]
786 799
787 datadeps = [ 800 data_deps += [ "//tools/xdisplaycheck" ]
788 "//tools/xdisplaycheck",
789 ]
790 } 801 }
791 802
792 if (is_mac) { 803 if (is_mac) {
793 deps += [ 804 deps += [
794 "//third_party/mozilla", 805 "//third_party/mozilla",
795 #'ui_base_tests_bundle', TODO(GYP) 806 #'ui_base_tests_bundle', TODO(GYP)
796 ] 807 ]
797 } 808 }
798 809
799 if (use_aura || toolkit_views) { 810 if (use_aura || toolkit_views) {
(...skipping 11 matching lines...) Expand all
811 "x/selection_requestor_unittest.cc", 822 "x/selection_requestor_unittest.cc",
812 ] 823 ]
813 } 824 }
814 825
815 if (is_chromeos) { 826 if (is_chromeos) {
816 deps += [ 827 deps += [
817 "//chromeos", 828 "//chromeos",
818 "//ui/events:dom_keycode_converter", 829 "//ui/events:dom_keycode_converter",
819 ] 830 ]
820 } 831 }
832
833 if (is_linux || is_mac || is_win) {
834 # TODO(brettw): We should be able to depend on //ui/resources:ui_test_pak
835 # instead of depending directly on the non-test .pak files, but depending
836 # on ui_test_pak seems to have no effect.
837 data += [
838 "test/data/data_pack_unittest/truncated-header.pak",
839 "$root_out_dir/ui_test.pak", # TODO(brettw): remove this line.
840 ]
841 data_deps += [
842 "//ui/resources:ui_test_pak", # TODO(brettw): this does nothing.
843 "//third_party/mesa:osmesa",
844 ]
845 }
846 if (is_linux || is_win) {
847 data += [
848 # TODO(brettw): Remove these two lines.
849 "$root_out_dir/ui/en-US.pak",
850 "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
851 ]
852 }
853 if (is_mac) {
854 data += [ "$root_out_dir/ui_unittests Framework.framework/" ]
855
856 if (use_asan && symbol_level == 0) {
857 data += [ "$root_out_dir/ui_base_unittests.dSYM/" ]
858 }
859 }
821 } 860 }
822 # TODO(GYP) Mac (ui_base_tests_bundle) 861 # TODO(GYP) Mac (ui_base_tests_bundle)
OLDNEW
« no previous file with comments | « tools/mb/mb.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698