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 /google_apis | |
| 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 'google_apis')
| -rw-r--r-- | google_apis/BUILD.gn | 72 |
1 files changed, 35 insertions, 37 deletions
diff --git a/google_apis/BUILD.gn b/google_apis/BUILD.gn index 1eae08f..b8ab4b6 100644 --- a/google_apis/BUILD.gn +++ b/google_apis/BUILD.gn @@ -198,45 +198,43 @@ source_set("test_support") { } } -if (!is_win || link_chrome_on_windows) { - test("google_apis_unittests") { - sources = [ - "gaia/gaia_auth_fetcher_unittest.cc", - "gaia/gaia_auth_util_unittest.cc", - "gaia/gaia_oauth_client_unittest.cc", - "gaia/google_service_auth_error_unittest.cc", - "gaia/merge_session_helper_unittest.cc", - "gaia/oauth2_access_token_fetcher_impl_unittest.cc", - "gaia/oauth2_api_call_flow_unittest.cc", - "gaia/oauth2_mint_token_flow_unittest.cc", - "gaia/oauth2_token_service_unittest.cc", - "gaia/oauth_request_signer_unittest.cc", - "gaia/ubertoken_fetcher_unittest.cc", - "google_api_keys_unittest.cc", - ] +test("google_apis_unittests") { + sources = [ + "gaia/gaia_auth_fetcher_unittest.cc", + "gaia/gaia_auth_util_unittest.cc", + "gaia/gaia_oauth_client_unittest.cc", + "gaia/google_service_auth_error_unittest.cc", + "gaia/merge_session_helper_unittest.cc", + "gaia/oauth2_access_token_fetcher_impl_unittest.cc", + "gaia/oauth2_api_call_flow_unittest.cc", + "gaia/oauth2_mint_token_flow_unittest.cc", + "gaia/oauth2_token_service_unittest.cc", + "gaia/oauth_request_signer_unittest.cc", + "gaia/ubertoken_fetcher_unittest.cc", + "google_api_keys_unittest.cc", + ] - configs += [ ":key_defines" ] + configs += [ ":key_defines" ] - deps = [ - ":google_apis", - ":test_support", - "//base", - "//base/test:run_all_unittests", - "//testing/gmock", - "//testing/gtest", - ] + deps = [ + ":google_apis", + ":test_support", + "//base", + "//base/test:run_all_unittests", + "//testing/gmock", + "//testing/gtest", + ] - if (enable_extensions) { - sources += [ - "drive/base_requests_server_unittest.cc", - "drive/base_requests_unittest.cc", - "drive/drive_api_parser_unittest.cc", - "drive/drive_api_requests_unittest.cc", - "drive/drive_api_url_generator_unittest.cc", - "drive/request_sender_unittest.cc", - "drive/request_util_unittest.cc", - "drive/time_util_unittest.cc", - ] - } + if (enable_extensions) { + sources += [ + "drive/base_requests_server_unittest.cc", + "drive/base_requests_unittest.cc", + "drive/drive_api_parser_unittest.cc", + "drive/drive_api_requests_unittest.cc", + "drive/drive_api_url_generator_unittest.cc", + "drive/request_sender_unittest.cc", + "drive/request_util_unittest.cc", + "drive/time_util_unittest.cc", + ] } } |