diff options
Diffstat (limited to 'chromium/google_apis/google_apis.gyp')
| -rw-r--r-- | chromium/google_apis/google_apis.gyp | 106 |
1 files changed, 87 insertions, 19 deletions
diff --git a/chromium/google_apis/google_apis.gyp b/chromium/google_apis/google_apis.gyp index 2d281f2b2f3..77dfce9c5d6 100644 --- a/chromium/google_apis/google_apis.gyp +++ b/chromium/google_apis/google_apis.gyp @@ -36,23 +36,29 @@ 'GOOGLE_DEFAULT_CLIENT_SECRET="<(google_default_client_secret)"', ] }], - [ 'OS == "android"', { - 'dependencies': [ - '../third_party/openssl/openssl.gyp:openssl', - ], - 'sources/': [ - ['exclude', 'cup/client_update_protocol_nss\.cc$'], - ], + ['OS == "mac" or OS == "ios" or OS == "win"', { + 'dependencies': [ + '../third_party/nss/nss.gyp:nspr', + '../third_party/nss/nss.gyp:nss', + ], + }], + ['OS == "android"', { + 'dependencies': [ + '../third_party/openssl/openssl.gyp:openssl', + ], + 'sources/': [ + ['exclude', 'cup/client_update_protocol_nss\.cc$'], + ], + }], + ['use_openssl==1', { + 'sources!': [ + 'cup/client_update_protocol_nss.cc', + ], + }, { + 'sources!': [ + 'cup/client_update_protocol_openssl.cc', + ], }], - [ 'use_openssl==1', { - 'sources!': [ - 'cup/client_update_protocol_nss.cc', - ], - }, { - 'sources!': [ - 'cup/client_update_protocol_openssl.cc', - ], - },], ], 'sources': [ 'cup/client_update_protocol.cc', @@ -73,8 +79,6 @@ 'drive/drive_api_url_generator.h', 'drive/drive_common_callbacks.h', 'drive/drive_entry_kinds.h', - 'drive/gdata_contacts_requests.cc', - 'drive/gdata_contacts_requests.h', 'drive/gdata_errorcode.cc', 'drive/gdata_errorcode.h', 'drive/gdata_wapi_requests.cc', @@ -91,6 +95,8 @@ 'drive/task_util.h', 'drive/time_util.cc', 'drive/time_util.h', + 'gaia/account_tracker.cc', + 'gaia/account_tracker.h', 'gaia/gaia_auth_consumer.cc', 'gaia/gaia_auth_consumer.h', 'gaia/gaia_auth_fetcher.cc', @@ -107,17 +113,27 @@ 'gaia/gaia_urls.h', 'gaia/google_service_auth_error.cc', 'gaia/google_service_auth_error.h', + 'gaia/identity_provider.cc', + 'gaia/identity_provider.h', + 'gaia/merge_session_helper.cc', + 'gaia/merge_session_helper.h', 'gaia/oauth_request_signer.cc', 'gaia/oauth_request_signer.h', 'gaia/oauth2_access_token_consumer.h', - 'gaia/oauth2_access_token_fetcher.cc', 'gaia/oauth2_access_token_fetcher.h', + 'gaia/oauth2_access_token_fetcher.cc', + 'gaia/oauth2_access_token_fetcher_impl.cc', + 'gaia/oauth2_access_token_fetcher_impl.h', 'gaia/oauth2_api_call_flow.cc', 'gaia/oauth2_api_call_flow.h', 'gaia/oauth2_mint_token_flow.cc', 'gaia/oauth2_mint_token_flow.h', 'gaia/oauth2_token_service.cc', 'gaia/oauth2_token_service.h', + 'gaia/oauth2_token_service_request.cc', + 'gaia/oauth2_token_service_request.h', + 'gaia/ubertoken_fetcher.cc', + 'gaia/ubertoken_fetcher.h', 'google_api_keys.cc', 'google_api_keys.h', ], @@ -129,14 +145,55 @@ 'type': 'executable', 'dependencies': [ '../base/base.gyp:run_all_unittests', + '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', 'google_apis', + 'google_apis_test_support', + ], + 'includes': [ + 'determine_use_official_keys.gypi', ], 'include_dirs': [ '..', ], 'sources': [ 'google_api_keys_unittest.cc', + 'cup/client_update_protocol_unittest.cc', + 'drive/base_requests_unittest.cc', + 'drive/base_requests_server_unittest.cc', + 'drive/drive_api_requests_unittest.cc', + 'drive/drive_api_parser_unittest.cc', + 'drive/drive_api_url_generator_unittest.cc', + 'drive/gdata_wapi_parser_unittest.cc', + 'drive/gdata_wapi_requests_unittest.cc', + 'drive/gdata_wapi_url_generator_unittest.cc', + 'drive/request_sender_unittest.cc', + 'drive/request_util_unittest.cc', + 'drive/time_util_unittest.cc', + 'gaia/account_tracker_unittest.cc', + '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/oauth_request_signer_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_request_unittest.cc', + 'gaia/oauth2_token_service_unittest.cc', + 'gaia/ubertoken_fetcher_unittest.cc', + ], + 'conditions': [ + ['OS=="android"', { + 'sources!': [ + 'drive/base_requests_server_unittest.cc', + 'drive/drive_api_parser_unittest.cc', + 'drive/drive_api_requests_unittest.cc', + 'drive/gdata_wapi_parser_unittest.cc', + 'drive/gdata_wapi_requests_unittest.cc', + ], + }], ], }, { @@ -155,8 +212,19 @@ '../net/net.gyp:net_test_support', ], 'sources': [ + 'drive/dummy_auth_service.cc', + 'drive/dummy_auth_service.h', + 'drive/test_util.cc', + 'drive/test_util.h', 'gaia/fake_gaia.cc', 'gaia/fake_gaia.h', + 'gaia/fake_identity_provider.cc', + 'gaia/fake_identity_provider.h', + 'gaia/fake_oauth2_token_service.cc', + 'gaia/fake_oauth2_token_service.h', + 'gaia/mock_url_fetcher_factory.h', + 'gaia/oauth2_token_service_test_util.cc', + 'gaia/oauth2_token_service_test_util.h', ], }, ], |