Skip to content

GitLab

T
tangled
Commit 4897a61f authored by brettw's avatar brettw Committed by Commit bot
Browse files
Options

Remove link_chrome_on_windows GN flag. 

This flag was used to disable linking when the bots were too behind. It's not needed any more.

Review URL: https://codereview.chromium.org/974543002

Cr-Commit-Position: refs/heads/master@{#318795}
parent 7b6ab410
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 934 additions and 976 deletions
ash/BUILD.gn
View file @ 4897a61f
...@@ -352,48 +352,46 @@ test("ash_unittests") { ...@@ -352,48 +352,46 @@ test("ash_unittests") {
} }
} }
if (!is_win || link_chrome_on_windows) { executable("ash_shell") {
executable("ash_shell") { testonly = true
testonly = true sources = [
sources = [ "shell/shell_main.cc",
"shell/shell_main.cc", ]
]
deps = [ deps = [
":ash_shell_lib", ":ash_shell_lib",
"//components/user_manager", "//components/user_manager",
] ]
if (is_win) { if (is_win) {
configs -= [ "//build/config/win:console" ] configs -= [ "//build/config/win:console" ]
configs += [ "//build/config/win:windowed" ] configs += [ "//build/config/win:windowed" ]
deps += [ "//sandbox" ] deps += [ "//sandbox" ]
} }
if (is_chromeos) { if (is_chromeos) {
deps += [ "//device/bluetooth" ] deps += [ "//device/bluetooth" ]
}
} }
}
test("ash_shell_unittests") { test("ash_shell_unittests") {
sources = [ sources = [
"shell/window_watcher_unittest.cc", "shell/window_watcher_unittest.cc",
"test/ash_unittests.cc", "test/ash_unittests.cc",
] ]
deps = [ deps = [
":ash_shell_lib", ":ash_shell_lib",
":test_support", ":test_support",
"//base/test:test_support", "//base/test:test_support",
"//components/user_manager", "//components/user_manager",
"//content/test:test_support", "//content/test:test_support",
"//skia", "//skia",
"//testing/gtest", "//testing/gtest",
"//ui/accessibility", "//ui/accessibility",
] ]
if (is_chromeos) { if (is_chromeos) {
deps += [ "//ui/display" ] deps += [ "//ui/display" ]
}
} }
} }
build/config/BUILDCONFIG.gn
View file @ 4897a61f
...@@ -113,11 +113,6 @@ declare_args() { ...@@ -113,11 +113,6 @@ declare_args() {
# toolchains. # toolchains.
cros_use_custom_toolchain = false cros_use_custom_toolchain = false
} }
# TODO(brettw) remove this flag (and therefore enable linking all targets) on
# Windows when we have sufficient bot capacity. In the meantime, you can
# enable linking for local compiles.
link_chrome_on_windows = true
} }
# TODO(dpranke): Remove these asserts when os and cpu_arch are removed. # TODO(dpranke): Remove these asserts when os and cpu_arch are removed.
......
cc/BUILD.gn
View file @ 4897a61f
This diff is collapsed.
cc/blink/BUILD.gn
View file @ 4897a61f
...@@ -72,7 +72,7 @@ component("blink") { ...@@ -72,7 +72,7 @@ component("blink") {
# GYP version: //cc/blink/cc_blink_tests.gyp:cc_blink_unittests # GYP version: //cc/blink/cc_blink_tests.gyp:cc_blink_unittests
# TODO(GYP): make linking work on the mac. # TODO(GYP): make linking work on the mac.
if (!is_mac && (!is_win || link_chrome_on_windows)) { if (!is_mac) {
test("cc_blink_unittests") { test("cc_blink_unittests") {
sources = [ sources = [
"web_animation_unittest.cc", "web_animation_unittest.cc",
......
chrome/BUILD.gn
View file @ 4897a61f
...@@ -12,16 +12,7 @@ if (is_android) { ...@@ -12,16 +12,7 @@ if (is_android) {
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
} }
if (is_win && !link_chrome_on_windows) { if (!is_android) {
# When linking is disabled on Windows, create a dummy Chrome target to
# make targets work that depend on Chrome.
group("chrome") {
}
group("main_dll") {
}
}
if (!is_android && (!is_win || link_chrome_on_windows)) {
# TODO(GYP) for Windows need to the the reorder-imports step which probably # TODO(GYP) for Windows need to the the reorder-imports step which probably
# means adding another target and renaming this to chrome_initial like in GYP. # means adding another target and renaming this to chrome_initial like in GYP.
executable("chrome") { executable("chrome") {
...@@ -153,89 +144,87 @@ if (!is_android && (!is_win || link_chrome_on_windows)) { ...@@ -153,89 +144,87 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
} }
} # !is_android } # !is_android
if (!is_win || link_chrome_on_windows) { shared_library("main_dll") {
shared_library("main_dll") { configs += [ "//build/config/compiler:wexit_time_destructors" ]
configs += [ "//build/config/compiler:wexit_time_destructors" ]
deps = [ deps = [
":browser_dependencies", ":browser_dependencies",
"//base/allocator", "//base/allocator",
] ]
if (is_win) { if (is_win) {
output_name = "chrome" output_name = "chrome"
sources = [ sources = [
"//base/win/dllmain.cc", "//base/win/dllmain.cc",
"app/chrome_command_ids.h", "app/chrome_command_ids.h",
"app/chrome_dll.rc", "app/chrome_dll.rc",
"app/chrome_dll_resource.h", "app/chrome_dll_resource.h",
"app/chrome_main.cc", "app/chrome_main.cc",
"app/chrome_main_delegate.cc", "app/chrome_main_delegate.cc",
"app/chrome_main_delegate.h", "app/chrome_main_delegate.h",
"app/close_handle_hook_win.cc", "app/close_handle_hook_win.cc",
"app/close_handle_hook_win.h", "app/close_handle_hook_win.h",
"app/delay_load_hook_win.cc", "app/delay_load_hook_win.cc",
"app/delay_load_hook_win.h", "app/delay_load_hook_win.h",
] ]
deps += [ deps += [
# On Windows, link the dependencies (libraries) that make up actual # On Windows, link the dependencies (libraries) that make up actual
# Chromium functionality into this .dll. # Chromium functionality into this .dll.
":chrome_version_resources", ":chrome_version_resources",
"//chrome/app/theme:chrome_unscaled_resources", "//chrome/app/theme:chrome_unscaled_resources",
"//chrome_elf", "//chrome_elf",
"//content/app/resources", "//content/app/resources",
"//crypto", "//crypto",
"//net:net_resources", "//net:net_resources",
"//third_party/wtl", "//third_party/wtl",
"//ui/views", "//ui/views",
] ]
if (enable_configuration_policy) { if (enable_configuration_policy) {
deps += [ "//components/policy" ] deps += [ "//components/policy" ]
} }
if (current_cpu == "x86") { if (current_cpu == "x86") {
# Add a dependency to custom import library for user32 delay imports only # Add a dependency to custom import library for user32 delay imports only
# in x86 builds. # in x86 builds.
#deps += [ 'chrome_user32_delay_imports' ] TODO(GYP) #deps += [ 'chrome_user32_delay_imports' ] TODO(GYP)
} }
# TODO(GYP) incremental linking flags in debug builds # TODO(GYP) incremental linking flags in debug builds
#'LinkIncremental': '<(msvs_large_module_debug_link_mode)', #'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
# TODO(GYP) Lots of VCLinkerTool stuff on Windows. # TODO(GYP) Lots of VCLinkerTool stuff on Windows.
# TODO(GYP) chrome_pgo_phase on Windows. # TODO(GYP) chrome_pgo_phase on Windows.
} }
if (use_aura) { if (use_aura) {
deps += [ "//ui/compositor" ] deps += [ "//ui/compositor" ]
} }
#TODO(GYP) add chrome_multiple_dll support #TODO(GYP) add chrome_multiple_dll support
if (false) { #chrome_multiple_dll) { if (false) { #chrome_multiple_dll) {
defines = [ "CHROME_MULTIPLE_DLL_BROWSER" ] defines = [ "CHROME_MULTIPLE_DLL_BROWSER" ]
deps += [ "//content/public/app:browser" ] deps += [ "//content/public/app:browser" ]
} else { } else {
deps += [ deps += [
":child_dependencies", ":child_dependencies",
"//content/public/app:both", "//content/public/app:both",
] ]
} }
if (cld_version == 0 || cld_version == 2) { if (cld_version == 0 || cld_version == 2) {
deps += [ "//third_party/cld_2" ] deps += [ "//third_party/cld_2" ]
} }
if (is_mac) { if (is_mac) {
#['OS=="mac" and component!="shared_library"', { TODO(GYP) #['OS=="mac" and component!="shared_library"', { TODO(GYP)
# 'includes': [ 'chrome_dll_bundle.gypi' ], # 'includes': [ 'chrome_dll_bundle.gypi' ],
#}], #}],
# TODO(GYP) Lots of other stuff in the OS=="mac" block. # TODO(GYP) Lots of other stuff in the OS=="mac" block.
} }
if (enable_plugins) { if (enable_plugins) {
deps += [ "//pdf" ] deps += [ "//pdf" ]
}
} }
} }
......
chrome/test/BUILD.gn
View file @ 4897a61f
...@@ -215,7 +215,7 @@ source_set("test_support_unit") { ...@@ -215,7 +215,7 @@ source_set("test_support_unit") {
] ]
} }
if (!is_android && (!is_win || link_chrome_on_windows)) { if (!is_android) {
import("//chrome/chrome_tests.gni") import("//chrome/chrome_tests.gni")
test("interactive_ui_tests") { test("interactive_ui_tests") {
......
components/BUILD.gn
View file @ 4897a61f
...@@ -221,89 +221,87 @@ group("all_components") { ...@@ -221,89 +221,87 @@ group("all_components") {
# component (it's important to use a source_set instead of a static library or # component (it's important to use a source_set instead of a static library or
# no tests will run) and add a reference here. You can add more than one unit # no tests will run) and add a reference here. You can add more than one unit
# test target if convenient. # test target if convenient.
if (!is_win || link_chrome_on_windows) { test("components_unittests") {
test("components_unittests") { sources = [
sources = [ "test/run_all_unittests.cc",
"test/run_all_unittests.cc", ]
]
# Add only ":unit_tests" dependencies here. If your tests have dependencies # Add only ":unit_tests" dependencies here. If your tests have dependencies
# (this would at least include the component itself), they should be on the # (this would at least include the component itself), they should be on the
# test source set and not here. # test source set and not here.
deps = [ deps = [
"//components/auto_login_parser:unit_tests", "//components/auto_login_parser:unit_tests",
"//components/autofill/content/browser:unit_tests", "//components/autofill/content/browser:unit_tests",
"//components/autofill/core/browser:unit_tests", "//components/autofill/core/browser:unit_tests",
"//components/autofill/core/common:unit_tests", "//components/autofill/core/common:unit_tests",
"//components/bookmarks/browser:unit_tests", "//components/bookmarks/browser:unit_tests",
"//components/captive_portal:unit_tests", "//components/captive_portal:unit_tests",
"//components/cloud_devices/common:unit_tests", "//components/cloud_devices/common:unit_tests",
"//components/content_settings/core/browser:unit_tests", "//components/content_settings/core/browser:unit_tests",
"//components/content_settings/core/common:unit_tests", "//components/content_settings/core/common:unit_tests",
"//components/crx_file:unit_tests", "//components/crx_file:unit_tests",
"//components/data_reduction_proxy/core/browser:unit_tests", "//components/data_reduction_proxy/core/browser:unit_tests",
"//components/data_reduction_proxy/core/common:unit_tests", "//components/data_reduction_proxy/core/common:unit_tests",
"//components/device_event_log:unit_tests", "//components/device_event_log:unit_tests",
"//components/dom_distiller/core:unit_tests", "//components/dom_distiller/core:unit_tests",
"//components/domain_reliability:unit_tests", "//components/domain_reliability:unit_tests",
"//components/favicon_base:unit_tests", "//components/favicon_base:unit_tests",
"//components/google/core/browser:unit_tests", "//components/google/core/browser:unit_tests",
"//components/invalidation:unittests", "//components/invalidation:unittests",
"//components/login:unit_tests", "//components/login:unit_tests",
"//components/metrics:unit_tests", "//components/metrics:unit_tests",
"//components/omnibox:unit_tests", "//components/omnibox:unit_tests",
"//components/ownership:unit_tests", "//components/ownership:unit_tests",
"//components/packed_ct_ev_whitelist:unit_tests", "//components/packed_ct_ev_whitelist:unit_tests",
"//components/proximity_auth:unit_tests", "//components/proximity_auth:unit_tests",
"//components/update_client:unit_tests", "//components/update_client:unit_tests",
"//components/variations:unit_tests", "//components/variations:unit_tests",
"//components/web_resource:unit_tests", "//components/web_resource:unit_tests",
"//components/webdata/common:unit_tests", "//components/webdata/common:unit_tests",
# These are the deps required by the code in this target. # These are the deps required by the code in this target.
"//base", "//base",
"//base/test:test_support", "//base/test:test_support",
"//content/test:test_support", "//content/test:test_support",
"//ui/base", "//ui/base",
] ]
data_deps = [ ":components_tests_pak" ] data_deps = [ ":components_tests_pak" ]
if (is_android) { if (is_android) {
deps += [ "//components/data_reduction_proxy/content/browser:unit_tests" ] deps += [ "//components/data_reduction_proxy/content/browser:unit_tests" ]
} }
# TODO(GYP) need this target. # TODO(GYP) need this target.
#'breakpad/app/crash_keys_win_unittest.cc', #'breakpad/app/crash_keys_win_unittest.cc',
# Precache tests need these defines. # Precache tests need these defines.
#configs += [ "//components/precache/core:precache_config" ] #configs += [ "//components/precache/core:precache_config" ]
if (toolkit_views) { if (toolkit_views) {
# TODO(GYP) enable this as above. # TODO(GYP) enable this as above.
#deps += [ "//components/constrained_window:unit_tests" ] #deps += [ "//components/constrained_window:unit_tests" ]
} }
if (is_win) { if (is_win) {
deps += [ "//components/browser_watcher:unit_tests" ] deps += [ "//components/browser_watcher:unit_tests" ]
}
} }
}
repack("components_tests_pak") { repack("components_tests_pak") {
sources = [ sources = [
"$root_gen_dir/components/components_resources.pak", "$root_gen_dir/components/components_resources.pak",
"$root_gen_dir/components/strings/components_strings_en-US.pak", "$root_gen_dir/components/strings/components_strings_en-US.pak",
"$root_gen_dir/ui/resources/ui_resources_100_percent.pak", "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
"$root_gen_dir/ui/resources/webui_resources.pak", "$root_gen_dir/ui/resources/webui_resources.pak",
"$root_gen_dir/ui/strings/app_locale_settings_en-US.pak", "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
"$root_gen_dir/ui/strings/ui_strings_en-US.pak", "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
] ]
output = "$root_out_dir/components_tests_resources.pak" output = "$root_out_dir/components_tests_resources.pak"
deps = [ deps = [
"//components/resources", "//components/resources",
"//components/strings", "//components/strings",
"//ui/resources", "//ui/resources",
"//ui/strings", "//ui/strings",
] ]
}
} }
content/shell/BUILD.gn
View file @ 4897a61f
...@@ -482,7 +482,7 @@ repack("pak") { ...@@ -482,7 +482,7 @@ repack("pak") {
# TODO(GYP): Figure out what this should be on android # TODO(GYP): Figure out what this should be on android
# and make linking this work on the Mac. # and make linking this work on the Mac.
if (!is_android && !is_mac && (!is_win || link_chrome_on_windows)) { if (!is_android && !is_mac) {
executable("content_shell") { executable("content_shell") {
testonly = true testonly = true
......
content/test/BUILD.gn
View file @ 4897a61f
...@@ -247,7 +247,7 @@ if (!is_ios) { ...@@ -247,7 +247,7 @@ if (!is_ios) {
} # !is_ios } # !is_ios
# TODO(GYP) enable content_browsertests on Mac when it links. # TODO(GYP) enable content_browsertests on Mac when it links.
if (!is_mac && (!is_win || link_chrome_on_windows)) { if (!is_mac) {
test("content_browsertests") { test("content_browsertests") {
sources = sources =
rebase_path(content_tests_gypi_values.content_browsertests_sources, rebase_path(content_tests_gypi_values.content_browsertests_sources,
...@@ -439,7 +439,7 @@ if (!is_mac && (!is_win || link_chrome_on_windows)) { ...@@ -439,7 +439,7 @@ if (!is_mac && (!is_win || link_chrome_on_windows)) {
} }
} }
if (!is_mac && (!is_win || link_chrome_on_windows)) { # TODO(GYP) enable on Mac once it links. if (!is_mac) { # TODO(GYP) enable on Mac once it links.
test("content_unittests") { test("content_unittests") {
sources = rebase_path(content_tests_gypi_values.content_unittests_sources, sources = rebase_path(content_tests_gypi_values.content_unittests_sources,
".", ".",
...@@ -631,7 +631,7 @@ if (!is_mac && (!is_win || link_chrome_on_windows)) { # TODO(GYP) enable on Mac ...@@ -631,7 +631,7 @@ if (!is_mac && (!is_win || link_chrome_on_windows)) { # TODO(GYP) enable on Mac
} }
} }
if (!is_mac && (!is_win || link_chrome_on_windows)) { # TODO(GYP) enable on Mac once it links. if (!is_mac) { # TODO(GYP) enable on Mac once it links.
test("content_perftests") { test("content_perftests") {
sources = [ sources = [
"../browser/net/sqlite_persistent_cookie_store_perftest.cc", "../browser/net/sqlite_persistent_cookie_store_perftest.cc",
......
extensions/shell/BUILD.gn
View file @ 4897a61f
...@@ -127,7 +127,7 @@ source_set("app_shell_lib") { ...@@ -127,7 +127,7 @@ source_set("app_shell_lib") {
} }
} }
if (!(is_chromeos && !use_ozone) && (!is_win || link_chrome_on_windows)) { if (!(is_chromeos && !use_ozone)) {
executable("app_shell") { executable("app_shell") {
# testonly because :app_shell_lib is testonly. See :app_shell_lib comment. # testonly because :app_shell_lib is testonly. See :app_shell_lib comment.
testonly = true testonly = true
......
google_apis/BUILD.gn
View file @ 4897a61f
...@@ -198,45 +198,43 @@ source_set("test_support") { ...@@ -198,45 +198,43 @@ source_set("test_support") {
} }
} }
if (!is_win || link_chrome_on_windows) { test("google_apis_unittests") {
test("google_apis_unittests") { sources = [
sources = [ "gaia/gaia_auth_fetcher_unittest.cc",
"gaia/gaia_auth_fetcher_unittest.cc", "gaia/gaia_auth_util_unittest.cc",
"gaia/gaia_auth_util_unittest.cc", "gaia/gaia_oauth_client_unittest.cc",
"gaia/gaia_oauth_client_unittest.cc", "gaia/google_service_auth_error_unittest.cc",
"gaia/google_service_auth_error_unittest.cc", "gaia/merge_session_helper_unittest.cc",
"gaia/merge_session_helper_unittest.cc", "gaia/oauth2_access_token_fetcher_impl_unittest.cc",
"gaia/oauth2_access_token_fetcher_impl_unittest.cc", "gaia/oauth2_api_call_flow_unittest.cc",
"gaia/oauth2_api_call_flow_unittest.cc", "gaia/oauth2_mint_token_flow_unittest.cc",
"gaia/oauth2_mint_token_flow_unittest.cc", "gaia/oauth2_token_service_unittest.cc",
"gaia/oauth2_token_service_unittest.cc", "gaia/oauth_request_signer_unittest.cc",
"gaia/oauth_request_signer_unittest.cc", "gaia/ubertoken_fetcher_unittest.cc",
"gaia/ubertoken_fetcher_unittest.cc", "google_api_keys_unittest.cc",
"google_api_keys_unittest.cc", ]
]
configs += [ ":key_defines" ] configs += [ ":key_defines" ]
deps = [ deps = [
":google_apis", ":google_apis",
":test_support", ":test_support",
"//base", "//base",
"//base/test:run_all_unittests", "//base/test:run_all_unittests",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
] ]
if (enable_extensions) { if (enable_extensions) {
sources += [ sources += [
"drive/base_requests_server_unittest.cc", "drive/base_requests_server_unittest.cc",
"drive/base_requests_unittest.cc", "drive/base_requests_unittest.cc",
"drive/drive_api_parser_unittest.cc", "drive/drive_api_parser_unittest.cc",
"drive/drive_api_requests_unittest.cc", "drive/drive_api_requests_unittest.cc",
"drive/drive_api_url_generator_unittest.cc", "drive/drive_api_url_generator_unittest.cc",
"drive/request_sender_unittest.cc", "drive/request_sender_unittest.cc",
"drive/request_util_unittest.cc", "drive/request_util_unittest.cc",
"drive/time_util_unittest.cc", "drive/time_util_unittest.cc",
] ]
}
} }
} }
gpu/BUILD.gn
View file @ 4897a61f
This diff is collapsed.
media/blink/BUILD.gn
View file @ 4897a61f
...@@ -83,7 +83,7 @@ component("blink") { ...@@ -83,7 +83,7 @@ component("blink") {
} }
} }
if (!is_mac && (!is_win || link_chrome_on_windows)) { if (!is_mac) {
# TODO(GYP): Make linking this work on the mac. # TODO(GYP): Make linking this work on the mac.
test("media_blink_unittests") { test("media_blink_unittests") {
deps = [ deps = [
......
ui/app_list/BUILD.gn
View file @ 4897a61f
...@@ -218,69 +218,67 @@ static_library("test_support") { ...@@ -218,69 +218,67 @@ static_library("test_support") {
] ]
} }
if (!is_win || link_chrome_on_windows) { test("app_list_unittests") {
test("app_list_unittests") { sources = [
sources = [ "app_list_item_list_unittest.cc",
"app_list_item_list_unittest.cc", "app_list_model_unittest.cc",
"app_list_model_unittest.cc", "folder_image_unittest.cc",
"folder_image_unittest.cc", "pagination_model_unittest.cc",
"pagination_model_unittest.cc", "search/history_data_store_unittest.cc",
"search/history_data_store_unittest.cc", "search/mixer_unittest.cc",
"search/mixer_unittest.cc", "search/term_break_iterator_unittest.cc",
"search/term_break_iterator_unittest.cc", "search/tokenized_string_char_iterator_unittest.cc",
"search/tokenized_string_char_iterator_unittest.cc", "search/tokenized_string_match_unittest.cc",
"search/tokenized_string_match_unittest.cc", "search/tokenized_string_unittest.cc",
"search/tokenized_string_unittest.cc", "test/run_all_unittests.cc",
"test/run_all_unittests.cc", ]
]
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
deps = [ deps = [
":app_list", ":app_list",
":test_support", ":test_support",
"//base", "//base",
"//base/test:test_support", "//base/test:test_support",
"//skia", "//skia",
"//testing/gtest", "//testing/gtest",
"//ui/base", "//ui/base",
"//ui/compositor", "//ui/compositor",
"//ui/events", "//ui/events",
"//ui/events:test_support", "//ui/events:test_support",
"//ui/gl", "//ui/gl",
"//ui/resources", "//ui/resources",
"//ui/resources:ui_test_pak", "//ui/resources:ui_test_pak",
] ]
if (toolkit_views) { if (toolkit_views) {
sources += [ sources += [
"views/app_list_main_view_unittest.cc", "views/app_list_main_view_unittest.cc",
"views/app_list_view_unittest.cc", "views/app_list_view_unittest.cc",
"views/apps_grid_view_unittest.cc", "views/apps_grid_view_unittest.cc",
"views/contents_view_unittest.cc", "views/contents_view_unittest.cc",
"views/folder_header_view_unittest.cc", "views/folder_header_view_unittest.cc",
"views/search_box_view_unittest.cc", "views/search_box_view_unittest.cc",
"views/search_result_list_view_unittest.cc", "views/search_result_list_view_unittest.cc",
"views/speech_view_unittest.cc", "views/speech_view_unittest.cc",
"views/test/apps_grid_view_test_api.cc", "views/test/apps_grid_view_test_api.cc",
"views/test/apps_grid_view_test_api.h", "views/test/apps_grid_view_test_api.h",
] ]
deps += [ deps += [
"//ui/views", "//ui/views",
"//ui/views:test_support", "//ui/views:test_support",
] ]
} }
if (is_mac) { if (is_mac) {
sources += [ sources += [
"cocoa/app_list_view_controller_unittest.mm", "cocoa/app_list_view_controller_unittest.mm",
"cocoa/app_list_window_controller_unittest.mm", "cocoa/app_list_window_controller_unittest.mm",
"cocoa/apps_grid_controller_unittest.mm", "cocoa/apps_grid_controller_unittest.mm",
"cocoa/apps_search_box_controller_unittest.mm", "cocoa/apps_search_box_controller_unittest.mm",
"cocoa/apps_search_results_controller_unittest.mm", "cocoa/apps_search_results_controller_unittest.mm",
"cocoa/test/apps_grid_controller_test_helper.h", "cocoa/test/apps_grid_controller_test_helper.h",
"cocoa/test/apps_grid_controller_test_helper.mm", "cocoa/test/apps_grid_controller_test_helper.mm",
] ]
}
} }
} }
ui/aura/BUILD.gn
View file @ 4897a61f
...@@ -243,63 +243,61 @@ executable("demo") { ...@@ -243,63 +243,61 @@ executable("demo") {
} }
} }
if (!is_win || link_chrome_on_windows) { executable("bench") {
executable("bench") { output_name = "aura_bench"
output_name = "aura_bench" testonly = true
testonly = true
sources = [ sources = [
"bench/bench_main.cc", "bench/bench_main.cc",
] ]
deps = [ deps = [
":test_support", ":test_support",
"//base", "//base",
"//base:i18n", "//base:i18n",
"//cc", "//cc",
"//gpu/command_buffer/client:gles2_interface", "//gpu/command_buffer/client:gles2_interface",
"//skia", "//skia",
"//third_party/icu", "//third_party/icu",
"//ui/base", "//ui/base",
"//ui/compositor", "//ui/compositor",
"//ui/compositor:test_support", "//ui/compositor:test_support",
"//ui/events", "//ui/events",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/gl", "//ui/gl",
] ]
if (use_x11) { if (use_x11) {
deps += [ "//ui/gfx/x" ] deps += [ "//ui/gfx/x" ]
}
} }
}
test("aura_unittests") { test("aura_unittests") {
sources = [ sources = [
"gestures/gesture_recognizer_unittest.cc", "gestures/gesture_recognizer_unittest.cc",
"test/run_all_unittests.cc", "test/run_all_unittests.cc",
"window_event_dispatcher_unittest.cc", "window_event_dispatcher_unittest.cc",
"window_targeter_unittest.cc", "window_targeter_unittest.cc",
"window_unittest.cc", "window_unittest.cc",
] ]
deps = [ deps = [
":test_support", ":test_support",
"//base/allocator", "//base/allocator",
"//base/test:test_support", "//base/test:test_support",
"//skia", "//skia",
"//testing/gtest", "//testing/gtest",
"//ui/base:test_support", "//ui/base:test_support",
"//ui/compositor:test_support", "//ui/compositor:test_support",
"//ui/events:test_support", "//ui/events:test_support",
"//ui/events:gesture_detection", "//ui/events:gesture_detection",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/gl", "//ui/gl",
] ]
if (is_linux) { if (is_linux) {
deps += [ "//third_party/mesa" ] deps += [ "//third_party/mesa" ]
}
} }
} }
ui/keyboard/BUILD.gn
View file @ 4897a61f
...@@ -93,33 +93,31 @@ build_closure("inputview") { ...@@ -93,33 +93,31 @@ build_closure("inputview") {
path = rebase_path("//third_party/google_input_tools") path = rebase_path("//third_party/google_input_tools")
} }
if (!is_win || link_chrome_on_windows) { test("keyboard_unittests") {
test("keyboard_unittests") { sources = [
sources = [ "keyboard_controller_unittest.cc",
"keyboard_controller_unittest.cc", "test/run_all_unittests.cc",
"test/run_all_unittests.cc", ]
]
deps = [ deps = [
":keyboard", ":keyboard",
"//base", "//base",
"//base/allocator", "//base/allocator",
"//base/test:test_support", "//base/test:test_support",
"//content", "//content",
"//skia", "//skia",
"//testing/gtest", "//testing/gtest",
"//ui/aura:test_support", "//ui/aura:test_support",
"//ui/base", "//ui/base",
"//ui/base/ime", "//ui/base/ime",
"//ui/base:test_support", "//ui/base:test_support",
"//ui/compositor:test_support", "//ui/compositor:test_support",
"//ui/events:test_support", "//ui/events:test_support",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/gl", "//ui/gl",
"//ui/resources:ui_test_pak", "//ui/resources:ui_test_pak",
"//ui/wm", "//ui/wm",
"//url", "//url",
] ]
}
} }
ui/message_center/BUILD.gn
View file @ 4897a61f
...@@ -176,65 +176,63 @@ static_library("test_support") { ...@@ -176,65 +176,63 @@ static_library("test_support") {
] ]
} }
if (!is_win || link_chrome_on_windows) { test("message_center_unittests") {
test("message_center_unittests") { sources = [
sources = [ "test/run_all_unittests.cc",
"test/run_all_unittests.cc", ]
]
deps = [
":message_center",
":test_support",
"//base",
"//base/allocator",
"//base/test:test_support",
"//skia",
"//testing/gtest",
"//ui/base",
"//ui/events",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/gl",
"//ui/resources",
"//ui/resources:ui_test_pak",
"//url",
]
deps = [ if (enable_notifications && !is_android) {
":message_center", sources += [
":test_support", "cocoa/notification_controller_unittest.mm",
"//base", "cocoa/popup_collection_unittest.mm",
"//base/allocator", "cocoa/popup_controller_unittest.mm",
"//base/test:test_support", "cocoa/settings_controller_unittest.mm",
"//skia", "cocoa/status_item_view_unittest.mm",
"//testing/gtest", "cocoa/tray_controller_unittest.mm",
"//ui/base", "cocoa/tray_view_controller_unittest.mm",
"//ui/events", "message_center_impl_unittest.cc",
"//ui/gfx", "message_center_tray_unittest.cc",
"//ui/gfx/geometry", "notification_delegate_unittest.cc",
"//ui/gl", "notification_list_unittest.cc",
"//ui/resources",
"//ui/resources:ui_test_pak",
"//url",
] ]
if (enable_notifications && !is_android) { if (is_mac) {
deps += [ "//ui/gfx:test_support" ]
}
if (toolkit_views && !is_mac) {
sources += [ sources += [
"cocoa/notification_controller_unittest.mm", "views/bounded_label_unittest.cc",
"cocoa/popup_collection_unittest.mm", "views/message_center_view_unittest.cc",
"cocoa/popup_controller_unittest.mm", "views/message_popup_collection_unittest.cc",
"cocoa/settings_controller_unittest.mm", "views/notification_view_unittest.cc",
"cocoa/status_item_view_unittest.mm", "views/notifier_settings_view_unittest.cc",
"cocoa/tray_controller_unittest.mm",
"cocoa/tray_view_controller_unittest.mm",
"message_center_impl_unittest.cc",
"message_center_tray_unittest.cc",
"notification_delegate_unittest.cc",
"notification_list_unittest.cc",
] ]
deps += [
if (is_mac) { # Compositor is needed by message_center_view_unittest.cc and for the
deps += [ "//ui/gfx:test_support" ] # fonts used by bounded_label_unittest.cc.
} "//ui/compositor",
"//ui/views",
if (toolkit_views && !is_mac) { "//ui/views:test_support",
sources += [ ]
"views/bounded_label_unittest.cc", }
"views/message_center_view_unittest.cc", } # enable_notifications && !is_android
"views/message_popup_collection_unittest.cc",
"views/notification_view_unittest.cc",
"views/notifier_settings_view_unittest.cc",
]
deps += [
# Compositor is needed by message_center_view_unittest.cc and for the
# fonts used by bounded_label_unittest.cc.
"//ui/compositor",
"//ui/views",
"//ui/views:test_support",
]
}
} # enable_notifications && !is_android
}
} }
ui/snapshot/BUILD.gn
View file @ 4897a61f
...@@ -56,37 +56,35 @@ component("snapshot") { ...@@ -56,37 +56,35 @@ component("snapshot") {
} }
} }
if (!is_win || link_chrome_on_windows) { test("snapshot_unittests") {
test("snapshot_unittests") { sources = [
sources = [ "snapshot_aura_unittest.cc",
"snapshot_aura_unittest.cc", "snapshot_mac_unittest.mm",
"snapshot_mac_unittest.mm", "test/run_all_unittests.cc",
"test/run_all_unittests.cc", ]
]
deps = [
":snapshot",
"//base",
"//base/allocator",
"//base/test:test_support",
"//skia",
"//testing/gtest",
"//ui/base",
"//ui/compositor:test_support",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/gl",
]
deps = [ if (use_aura) {
":snapshot", deps += [
"//base", "//ui/aura:test_support",
"//base/allocator", "//ui/compositor",
"//base/test:test_support",
"//skia",
"//testing/gtest",
"//ui/base",
"//ui/compositor:test_support", "//ui/compositor:test_support",
"//ui/gfx", "//ui/wm",
"//ui/gfx/geometry",
"//ui/gl",
] ]
} else {
if (use_aura) { sources -= [ "snapshot_aura_unittest.cc" ]
deps += [
"//ui/aura:test_support",
"//ui/compositor",
"//ui/compositor:test_support",
"//ui/wm",
]
} else {
sources -= [ "snapshot_aura_unittest.cc" ]
}
} }
} }
ui/views/BUILD.gn
View file @ 4897a61f
...@@ -162,104 +162,102 @@ static_library("test_support") { ...@@ -162,104 +162,102 @@ static_library("test_support") {
} }
} }
if (!is_win || link_chrome_on_windows) { test("views_unittests") {
test("views_unittests") { sources = gypi_values.views_unittests_sources
sources = gypi_values.views_unittests_sources
deps = [ deps = [
":test_support", ":test_support",
"//base", "//base",
"//base:i18n", "//base:i18n",
"//base/allocator", "//base/allocator",
"//base/test:test_support", "//base/test:test_support",
"//skia", "//skia",
"//testing/gtest", "//testing/gtest",
"//third_party/icu", "//third_party/icu",
"//ui/accessibility", "//ui/accessibility",
"//ui/aura", "//ui/aura",
"//ui/base", "//ui/base",
"//ui/base/ime", "//ui/base/ime",
"//ui/base:test_support", "//ui/base:test_support",
"//ui/compositor:test_support", "//ui/compositor:test_support",
"//ui/events:test_support", "//ui/events:test_support",
"//ui/events:events_base", "//ui/events:events_base",
"//ui/events/platform", "//ui/events/platform",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/gl", "//ui/gl",
"//ui/resources", "//ui/resources",
"//ui/strings", "//ui/strings",
"//ui/wm", "//ui/wm",
"//url", "//url",
] ]
if (is_win) { if (is_win) {
deps += [ deps += [
"//third_party/iaccessible2", "//third_party/iaccessible2",
"//third_party/wtl", "//third_party/wtl",
] ]
libs = [ libs = [
"imm32.lib", "imm32.lib",
"oleacc.lib", "oleacc.lib",
"comctl32.lib", "comctl32.lib",
] ]
# TOOD(GYP) # TOOD(GYP)
#'msvs_settings': { #'msvs_settings': {
# 'VCManifestTool': { # 'VCManifestTool': {
# 'AdditionalManifestFiles': [ # 'AdditionalManifestFiles': [
# '$(ProjectDir)\\test\\views_unittest.manifest', # '$(ProjectDir)\\test\\views_unittest.manifest',
# ], # ],
# }, # },
#}, #},
} }
if (use_x11) { if (use_x11) {
configs += [ configs += [
"//build/config/linux:x11", "//build/config/linux:x11",
"//build/config/linux:xext", "//build/config/linux:xext",
] ]
deps += [ deps += [
"//ui/events/devices", "//ui/events/devices",
"//ui/events/platform/x11", "//ui/events/platform/x11",
"//ui/gfx/x", "//ui/gfx/x",
] ]
} }
if (use_aura) { if (use_aura) {
sources += gypi_values.views_unittests_aura_sources sources += gypi_values.views_unittests_aura_sources
deps += [ "//ui/aura:test_support" ] deps += [ "//ui/aura:test_support" ]
if (!is_chromeos) {
sources += gypi_values.views_unittests_desktop_aura_sources
if (use_x11) {
sources += gypi_values.views_unittests_desktop_aurax11_sources
}
}
}
if (!is_chromeos) { if (!is_chromeos) {
sources += gypi_values.views_unittests_desktop_sources sources += gypi_values.views_unittests_desktop_aura_sources
} if (use_x11) {
if (use_x11) { sources += gypi_values.views_unittests_desktop_aurax11_sources
deps += [ }
"//ui/events/platform/x11",
"//ui/gfx/x",
]
} }
}
if (!is_chromeos) {
sources += gypi_values.views_unittests_desktop_sources
}
if (use_x11) {
deps += [
"//ui/events/platform/x11",
"//ui/gfx/x",
]
}
if (is_mac) { if (is_mac) {
# views_unittests not yet compiling on Mac. http://crbug.com/378134 # views_unittests not yet compiling on Mac. http://crbug.com/378134
sources -= [ sources -= [
"bubble/bubble_window_targeter_unittest.cc", "bubble/bubble_window_targeter_unittest.cc",
"controls/button/custom_button_unittest.cc", "controls/button/custom_button_unittest.cc",
"controls/button/menu_button_unittest.cc", "controls/button/menu_button_unittest.cc",
"controls/menu/menu_controller_unittest.cc", "controls/menu/menu_controller_unittest.cc",
"controls/native/native_view_host_unittest.cc", "controls/native/native_view_host_unittest.cc",
"focus/focus_manager_unittest.cc", "focus/focus_manager_unittest.cc",
"ime/input_method_bridge_unittest.cc", "ime/input_method_bridge_unittest.cc",
"widget/widget_unittest.cc", "widget/widget_unittest.cc",
"widget/window_reorderer_unittest.cc", "widget/window_reorderer_unittest.cc",
] ]
}
} }
} }
......
ui/views/examples/BUILD.gn
View file @ 4897a61f
...@@ -88,35 +88,33 @@ component("views_examples_lib") { ...@@ -88,35 +88,33 @@ component("views_examples_lib") {
} }
} }
if (!is_win || link_chrome_on_windows) { executable("views_examples_exe") {
executable("views_examples_exe") { testonly = true
testonly = true
sources = [
sources = [ "examples_main.cc",
"examples_main.cc", ]
]
deps = [
deps = [ ":views_examples_lib",
":views_examples_lib", "//base",
"//base", "//base:i18n",
"//base:i18n", "//ui/base",
"//ui/base", "//ui/compositor",
"//ui/compositor", "//ui/compositor:test_support",
"//ui/compositor:test_support", "//ui/gfx",
"//ui/gfx", "//ui/gl",
"//ui/gl", "//ui/resources:ui_test_pak",
"//ui/resources:ui_test_pak", "//ui/views",
"//ui/views", "//ui/views:test_support",
"//ui/views:test_support", "//ui/wm",
"//ui/wm", ]
]
if (use_aura) {
if (use_aura) { deps += [ "//ui/aura" ]
deps += [ "//ui/aura" ] }
} if (use_x11) {
if (use_x11) { deps += [ "//ui/gfx/x" ]
deps += [ "//ui/gfx/x" ]
}
} }
} }
......
ui/wm/BUILD.gn
View file @ 4897a61f
...@@ -115,39 +115,37 @@ static_library("test_support") { ...@@ -115,39 +115,37 @@ static_library("test_support") {
] ]
} }
if (!is_win || link_chrome_on_windows) { test("wm_unittests") {
test("wm_unittests") { sources = [
sources = [ "core/capture_controller_unittest.cc",
"core/capture_controller_unittest.cc", "core/compound_event_filter_unittest.cc",
"core/compound_event_filter_unittest.cc", "core/cursor_manager_unittest.cc",
"core/cursor_manager_unittest.cc", "core/focus_controller_unittest.cc",
"core/focus_controller_unittest.cc", "core/image_grid_unittest.cc",
"core/image_grid_unittest.cc", "core/input_method_event_filter_unittest.cc",
"core/input_method_event_filter_unittest.cc", "core/nested_accelerator_controller_unittest.cc",
"core/nested_accelerator_controller_unittest.cc", "core/shadow_controller_unittest.cc",
"core/shadow_controller_unittest.cc", "core/transient_window_manager_unittest.cc",
"core/transient_window_manager_unittest.cc", "core/transient_window_stacking_client_unittest.cc",
"core/transient_window_stacking_client_unittest.cc", "core/visibility_controller_unittest.cc",
"core/visibility_controller_unittest.cc", "core/window_animations_unittest.cc",
"core/window_animations_unittest.cc", "test/run_all_unittests.cc",
"test/run_all_unittests.cc", ]
]
deps = [ deps = [
":test_support", ":test_support",
":wm", ":wm",
"//base", "//base",
"//base/test:test_support", "//base/test:test_support",
"//skia", "//skia",
"//testing/gtest", "//testing/gtest",
"//ui/aura:test_support", "//ui/aura:test_support",
"//ui/base:test_support", "//ui/base:test_support",
"//ui/compositor:test_support", "//ui/compositor:test_support",
"//ui/events:test_support", "//ui/events:test_support",
"//ui/events/platform", "//ui/events/platform",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/gl", "//ui/gl",
] ]
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment