diff options
author | brettw <brettw@chromium.org> | 2015-03-02 15:13:15 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-02 23:13:43 +0000 |
commit | 4897a61fd022efb0b43033846fe878a351c55b35 (patch) | |
tree | eed715fb2228d213fba3c5ed4af541f23e3e23d6 /components/BUILD.gn | |
parent | 7b6ab410b0665dcb84c2818f4453b36f2c5a1e36 (diff) | |
download | chromium_src-4897a61fd022efb0b43033846fe878a351c55b35.zip chromium_src-4897a61fd022efb0b43033846fe878a351c55b35.tar.gz chromium_src-4897a61fd022efb0b43033846fe878a351c55b35.tar.bz2 |
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}
Diffstat (limited to 'components/BUILD.gn')
-rw-r--r-- | components/BUILD.gn | 148 |
1 files changed, 73 insertions, 75 deletions
diff --git a/components/BUILD.gn b/components/BUILD.gn index d7cd5cf..39548d7 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -221,89 +221,87 @@ group("all_components") { # 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 # test target if convenient. -if (!is_win || link_chrome_on_windows) { - test("components_unittests") { - sources = [ - "test/run_all_unittests.cc", - ] +test("components_unittests") { + sources = [ + "test/run_all_unittests.cc", + ] - # Add only ":unit_tests" dependencies here. If your tests have dependencies - # (this would at least include the component itself), they should be on the - # test source set and not here. - deps = [ - "//components/auto_login_parser:unit_tests", - "//components/autofill/content/browser:unit_tests", - "//components/autofill/core/browser:unit_tests", - "//components/autofill/core/common:unit_tests", - "//components/bookmarks/browser:unit_tests", - "//components/captive_portal:unit_tests", - "//components/cloud_devices/common:unit_tests", - "//components/content_settings/core/browser:unit_tests", - "//components/content_settings/core/common:unit_tests", - "//components/crx_file:unit_tests", - "//components/data_reduction_proxy/core/browser:unit_tests", - "//components/data_reduction_proxy/core/common:unit_tests", - "//components/device_event_log:unit_tests", - "//components/dom_distiller/core:unit_tests", - "//components/domain_reliability:unit_tests", - "//components/favicon_base:unit_tests", - "//components/google/core/browser:unit_tests", - "//components/invalidation:unittests", - "//components/login:unit_tests", - "//components/metrics:unit_tests", - "//components/omnibox:unit_tests", - "//components/ownership:unit_tests", - "//components/packed_ct_ev_whitelist:unit_tests", - "//components/proximity_auth:unit_tests", - "//components/update_client:unit_tests", - "//components/variations:unit_tests", - "//components/web_resource:unit_tests", - "//components/webdata/common:unit_tests", + # Add only ":unit_tests" dependencies here. If your tests have dependencies + # (this would at least include the component itself), they should be on the + # test source set and not here. + deps = [ + "//components/auto_login_parser:unit_tests", + "//components/autofill/content/browser:unit_tests", + "//components/autofill/core/browser:unit_tests", + "//components/autofill/core/common:unit_tests", + "//components/bookmarks/browser:unit_tests", + "//components/captive_portal:unit_tests", + "//components/cloud_devices/common:unit_tests", + "//components/content_settings/core/browser:unit_tests", + "//components/content_settings/core/common:unit_tests", + "//components/crx_file:unit_tests", + "//components/data_reduction_proxy/core/browser:unit_tests", + "//components/data_reduction_proxy/core/common:unit_tests", + "//components/device_event_log:unit_tests", + "//components/dom_distiller/core:unit_tests", + "//components/domain_reliability:unit_tests", + "//components/favicon_base:unit_tests", + "//components/google/core/browser:unit_tests", + "//components/invalidation:unittests", + "//components/login:unit_tests", + "//components/metrics:unit_tests", + "//components/omnibox:unit_tests", + "//components/ownership:unit_tests", + "//components/packed_ct_ev_whitelist:unit_tests", + "//components/proximity_auth:unit_tests", + "//components/update_client:unit_tests", + "//components/variations:unit_tests", + "//components/web_resource:unit_tests", + "//components/webdata/common:unit_tests", - # These are the deps required by the code in this target. - "//base", - "//base/test:test_support", - "//content/test:test_support", - "//ui/base", - ] - data_deps = [ ":components_tests_pak" ] + # These are the deps required by the code in this target. + "//base", + "//base/test:test_support", + "//content/test:test_support", + "//ui/base", + ] + data_deps = [ ":components_tests_pak" ] - if (is_android) { - deps += [ "//components/data_reduction_proxy/content/browser:unit_tests" ] - } + if (is_android) { + deps += [ "//components/data_reduction_proxy/content/browser:unit_tests" ] + } - # TODO(GYP) need this target. - #'breakpad/app/crash_keys_win_unittest.cc', + # TODO(GYP) need this target. + #'breakpad/app/crash_keys_win_unittest.cc', - # Precache tests need these defines. - #configs += [ "//components/precache/core:precache_config" ] + # Precache tests need these defines. + #configs += [ "//components/precache/core:precache_config" ] - if (toolkit_views) { - # TODO(GYP) enable this as above. - #deps += [ "//components/constrained_window:unit_tests" ] - } - if (is_win) { - deps += [ "//components/browser_watcher:unit_tests" ] - } + if (toolkit_views) { + # TODO(GYP) enable this as above. + #deps += [ "//components/constrained_window:unit_tests" ] + } + if (is_win) { + deps += [ "//components/browser_watcher:unit_tests" ] } +} - repack("components_tests_pak") { - sources = [ - "$root_gen_dir/components/components_resources.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/webui_resources.pak", - "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak", - "$root_gen_dir/ui/strings/ui_strings_en-US.pak", - ] +repack("components_tests_pak") { + sources = [ + "$root_gen_dir/components/components_resources.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/webui_resources.pak", + "$root_gen_dir/ui/strings/app_locale_settings_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 = [ - "//components/resources", - "//components/strings", - "//ui/resources", - "//ui/strings", - ] - } + deps = [ + "//components/resources", + "//components/strings", + "//ui/resources", + "//ui/strings", + ] } |