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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/components_tests.gyp

Issue 1077663002: Remove android_webview_build conditions from components_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 1dab80f0902f102933378f2738069d784099de06..e5eb75ea7c2c4280220b0b22fd68c8bddad09df4 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -545,508 +545,506 @@
'webdata/common/web_database_migration_unittest.cc',
],
},
- 'conditions': [
- ['android_webview_build == 0', {
- 'targets': [
+ 'targets': [
+ {
+ # GN version: //components:components_tests_pak
+ 'target_name': 'components_tests_pak',
+ 'type': 'none',
+ 'dependencies': [
+ '../ui/resources/ui_resources.gyp:ui_resources',
+ '../ui/strings/ui_strings.gyp:ui_strings',
+ 'components_resources.gyp:components_resources',
+ 'components_strings.gyp:components_strings',
+ ],
+ 'actions': [
{
- # GN version: //components:components_tests_pak
- 'target_name': 'components_tests_pak',
- 'type': 'none',
+ 'action_name': 'repack_components_tests_pak',
+ 'variables': {
+ 'pak_inputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en-US.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
+ ],
+ 'pak_output': '<(PRODUCT_DIR)/components_tests_resources.pak',
+ },
+ 'includes': [ '../build/repack_action.gypi' ],
+ },
+ ],
+ 'direct_dependent_settings': {
+ 'mac_bundle_resources': [
+ '<(PRODUCT_DIR)/components_tests_resources.pak',
+ ],
+ },
+ },
+ {
+ # GN version: //components:components_unittests
+ 'target_name': 'components_unittests',
+ 'type': '<(gtest_target_type)',
+ 'sources': [
+ 'test/run_all_unittests.cc',
+
+ '<@(auto_login_parser_unittest_sources)',
+ '<@(autofill_unittest_sources)',
+ '<@(bookmarks_unittest_sources)',
+ '<@(browser_watcher_unittest_sources)',
+ '<@(captive_portal_unittest_sources)',
+ '<@(cloud_devices_unittest_sources)',
+ '<@(content_settings_unittest_sources)',
+ '<@(crash_unittest_sources)',
+ '<@(crx_file_unittest_sources)',
+ '<@(data_reduction_proxy_unittest_sources)',
+ '<@(device_event_log_unittest_sources)',
+ '<@(dom_distiller_unittest_sources)',
+ '<@(domain_reliability_unittest_sources)',
+ '<@(enhanced_bookmarks_unittest_sources)',
+ '<@(favicon_base_unittest_sources)',
+ '<@(gcm_driver_unittest_sources)',
+ '<@(google_unittest_sources)',
+ '<@(history_unittest_sources)',
+ '<@(json_schema_unittest_sources)',
+ '<@(keyed_service_unittest_sources)',
+ '<@(language_usage_metrics_unittest_sources)',
+ '<@(leveldb_proto_unittest_sources)',
+ '<@(login_unittest_sources)',
+ '<@(metrics_unittest_sources)',
+ '<@(network_time_unittest_sources)',
+ '<@(omnibox_unittest_sources)',
+ '<@(os_crypt_unittest_sources)',
+ '<@(ownership_unittest_sources)',
+ '<@(packed_ct_ev_whitelist_unittest_sources)',
+ '<@(password_manager_unittest_sources)',
+ '<@(precache_unittest_sources)',
+ '<@(query_parser_unittest_sources)',
+ '<@(rappor_unittest_sources)',
+ '<@(search_unittest_sources)',
+ '<@(search_provider_logos_unittest_sources)',
+ '<@(sessions_unittest_sources)',
+ '<@(signin_unittest_sources)',
+ '<@(suggestions_unittest_sources)',
+ '<@(sync_driver_unittest_sources)',
+ '<@(translate_unittest_sources)',
+ '<@(update_client_unittest_sources)',
+ '<@(url_fixer_unittest_sources)',
+ '<@(url_matcher_unittest_sources)',
+ '<@(variations_unittest_sources)',
+ '<@(wallpaper_unittest_sources)',
+ '<@(web_resource_unittest_sources)',
+ '<@(webdata_unittest_sources)',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:base_prefs_test_support',
+ '../base/base.gyp:test_support_base',
+ # TODO(blundell): Eliminate the need for this dependency in code
+ # that iOS shares. crbug.com/325243
+ '../content/content_shell_and_tests.gyp:test_support_content',
+ '../google_apis/google_apis.gyp:google_apis_test_support',
+ '../jingle/jingle.gyp:notifier_test_util',
+ '../net/net.gyp:net_test_support',
+ '../sql/sql.gyp:test_support_sql',
+ '../sync/sync.gyp:sync',
+ '../sync/sync.gyp:test_support_sync_api',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+ '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+ '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util',
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
+ '../third_party/libxml/libxml.gyp:libxml',
+ '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+ '../ui/base/ui_base.gyp:ui_base',
+ '../ui/gfx/gfx.gyp:gfx',
+ '../ui/gfx/gfx.gyp:gfx_test_support',
+ '../ui/resources/ui_resources.gyp:ui_resources',
+ '../ui/strings/ui_strings.gyp:ui_strings',
+ '../url/url.gyp:url_lib',
+ 'components.gyp:auto_login_parser',
+ 'components.gyp:autofill_core_browser',
+ 'components.gyp:autofill_core_common',
+ 'components.gyp:autofill_core_test_support',
+ 'components.gyp:bookmarks_browser',
+ 'components.gyp:bookmarks_managed',
+ 'components.gyp:bookmarks_test_support',
+ 'components.gyp:captive_portal_test_support',
+ 'components.gyp:cloud_devices_common',
+ 'components.gyp:content_settings_core_browser',
+ 'components.gyp:content_settings_core_common',
+ 'components.gyp:content_settings_core_test_support',
+ 'components.gyp:crash_test_support',
+ 'components.gyp:crx_file',
+ 'components.gyp:data_reduction_proxy_core_browser',
+ 'components.gyp:data_reduction_proxy_core_common',
+ 'components.gyp:data_reduction_proxy_test_support',
+ 'components.gyp:device_event_log_component',
+ 'components.gyp:dom_distiller_core',
+ 'components.gyp:dom_distiller_protos',
+ 'components.gyp:dom_distiller_test_support',
+ 'components.gyp:domain_reliability',
+ 'components.gyp:enhanced_bookmarks',
+ 'components.gyp:enhanced_bookmarks_test_support',
+ 'components.gyp:favicon_base',
+ 'components.gyp:gcm_driver',
+ 'components.gyp:gcm_driver_test_support',
+ 'components.gyp:google_core_browser',
+ 'components.gyp:history_core_browser',
+ 'components.gyp:history_core_common',
+ 'components.gyp:history_core_test_support',
+ 'components.gyp:invalidation',
+ 'components.gyp:invalidation_test_support',
+ 'components.gyp:json_schema',
+ 'components.gyp:keyed_service_core',
+ 'components.gyp:language_usage_metrics',
+ 'components.gyp:leveldb_proto',
+ 'components.gyp:leveldb_proto_test_support',
+ 'components.gyp:login',
+ 'components.gyp:metrics',
+ 'components.gyp:metrics_gpu',
+ 'components.gyp:metrics_net',
+ 'components.gyp:metrics_profiler',
+ 'components.gyp:metrics_test_support',
+ 'components.gyp:network_time',
+ 'components.gyp:omnibox',
+ 'components.gyp:omnibox_test_support',
+ 'components.gyp:os_crypt',
+ 'components.gyp:ownership',
+ 'components.gyp:packed_ct_ev_whitelist',
+ 'components.gyp:password_manager_core_browser',
+ 'components.gyp:password_manager_core_browser',
+ 'components.gyp:password_manager_core_browser_test_support',
+ 'components.gyp:precache_core',
+ 'components.gyp:pref_registry_test_support',
+ 'components.gyp:query_parser',
+ 'components.gyp:rappor',
+ 'components.gyp:rappor_test_support',
+ 'components.gyp:search',
+ 'components.gyp:search_engines',
+ 'components.gyp:search_engines_test_support',
+ 'components.gyp:search_provider_logos',
+ 'components.gyp:sessions_test_support',
+ 'components.gyp:signin_core_browser',
+ 'components.gyp:signin_core_browser_test_support',
+ 'components.gyp:suggestions',
+ 'components.gyp:sync_driver_test_support',
+ 'components.gyp:translate_core_browser',
+ 'components.gyp:translate_core_common',
+ 'components.gyp:translate_core_language_detection',
+ 'components.gyp:ui_zoom',
+ 'components.gyp:update_client',
+ 'components.gyp:update_client_test_support',
+ 'components.gyp:url_fixer',
+ 'components.gyp:variations',
+ 'components.gyp:variations_http_provider',
+ 'components.gyp:wallpaper',
+ 'components.gyp:web_resource',
+ 'components.gyp:web_resource_test_support',
+ 'components_resources.gyp:components_resources',
+ 'components_strings.gyp:components_strings',
+ 'components_tests_pak',
+ ],
+ 'conditions': [
+ ['toolkit_views == 1', {
+ 'sources': [
+ 'bookmarks/browser/bookmark_node_data_unittest.cc',
+ 'constrained_window/constrained_window_views_unittest.cc',
+ ],
'dependencies': [
- '../ui/resources/ui_resources.gyp:ui_resources',
- '../ui/strings/ui_strings.gyp:ui_strings',
- 'components_resources.gyp:components_resources',
- 'components_strings.gyp:components_strings',
+ '<(DEPTH)/ui/views/views.gyp:views_test_support',
+ 'components.gyp:constrained_window',
+ ]
+ }],
+ ['OS=="win"', {
+ 'dependencies': [
+ 'components.gyp:browser_watcher',
+ 'components.gyp:browser_watcher_client',
+ ]
+ }],
+ ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
+ 'dependencies': [
+ '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ [ 'cld_version==0 or cld_version==2', {
+ 'dependencies': [
+ # Unit tests should always use statically-linked CLD data.
+ '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ],
+ }],
+ ['OS != "ios"', {
+ 'sources': [
+ '<@(error_page_unittest_sources)',
+ '<@(navigation_interception_unittest_sources)',
+ '<@(network_hints_unittest_sources)',
+ '<@(power_unittest_sources)',
+ '<@(storage_monitor_unittest_sources)',
+ '<@(ui_unittest_sources)',
+ '<@(visitedlink_unittest_sources)',
+ '<@(web_cache_unittest_sources)',
+ '<@(web_modal_unittest_sources)',
+ ],
+ 'dependencies': [
+ '../skia/skia.gyp:skia',
+ 'components.gyp:autofill_content_browser',
+ 'components.gyp:autofill_content_renderer',
+ 'components.gyp:autofill_content_test_support',
+ 'components.gyp:data_reduction_proxy_content_browser',
+ 'components.gyp:dom_distiller_content',
+ 'components.gyp:error_page_renderer',
+ 'components.gyp:history_content_browser',
+ 'components.gyp:keyed_service_content',
+ 'components.gyp:navigation_interception',
+ 'components.gyp:network_hints_renderer',
+ 'components.gyp:password_manager_content_browser',
+ 'components.gyp:password_manager_content_common',
+ 'components.gyp:power',
+ 'components.gyp:precache_content',
+ 'components.gyp:sessions_content',
+ 'components.gyp:storage_monitor',
+ 'components.gyp:storage_monitor_test_support',
+ 'components.gyp:url_matcher',
+ 'components.gyp:visitedlink_browser',
+ 'components.gyp:visitedlink_renderer',
+ 'components.gyp:web_cache_browser',
+ 'components.gyp:web_modal',
+ 'components.gyp:web_modal_test_support',
+ ],
+ }, { # 'OS == "ios"'
+ 'sources': [
+ 'open_from_clipboard/clipboard_recent_content_ios_unittest.mm',
+ 'webp_transcode/webp_decoder_unittest.mm',
+ 'webp_transcode/webp_network_client_unittest.mm',
+ ],
+ 'sources!': [
+ 'metrics/gpu/gpu_metrics_provider_unittest.cc',
+ 'signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc',
+ ],
+ 'sources/': [
+ # Exclude all tests that depends on //content (based on layered-
+ # component directory structure).
+ ['exclude', '^[^/]*/content/'],
+ ],
+ 'dependencies': [
+ '../ios/ios_tests.gyp:test_support_ios',
+ '../ios/web/ios_web.gyp:test_support_ios_web',
+ '../third_party/ocmock/ocmock.gyp:ocmock',
+ 'components.gyp:open_from_clipboard',
+ 'components.gyp:sessions_ios',
+ 'components.gyp:signin_ios_browser',
+ 'components.gyp:translate_ios_browser',
+ 'components.gyp:webp_transcode',
],
'actions': [
{
- 'action_name': 'repack_components_tests_pak',
+ 'action_name': 'copy_test_data',
'variables': {
- 'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en-US.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
+ 'test_data_files': [
+ 'test/data',
],
- 'pak_output': '<(PRODUCT_DIR)/components_tests_resources.pak',
+ 'test_data_prefix': 'components',
},
- 'includes': [ '../build/repack_action.gypi' ],
+ 'includes': [ '../build/copy_test_data_ios.gypi' ],
},
],
- 'direct_dependent_settings': {
- 'mac_bundle_resources': [
- '<(PRODUCT_DIR)/components_tests_resources.pak',
+ 'conditions': [
+ ['configuration_policy==1', {
+ 'sources/': [
+ ['include', '^policy/'],
+ ],
+ }],
+ ],
+ }],
+ ['disable_nacl==0', {
+ 'sources': [
+ '<@(nacl_unittest_sources)',
+ ],
+ 'dependencies': [
+ 'nacl.gyp:nacl_browser',
+ 'nacl.gyp:nacl_common',
+ ],
+ }],
+ ['OS == "mac"', {
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/AddressBook.framework',
+ '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+ '$(SDKROOT)/System/Library/Frameworks/ImageCaptureCore.framework',
],
},
- },
- {
- # GN version: //components:components_unittests
- 'target_name': 'components_unittests',
- 'type': '<(gtest_target_type)',
+ 'sources!': [
+ 'password_manager/core/browser/password_store_default_unittest.cc',
+ ],
+ }],
+ ['OS == "android"', {
'sources': [
- 'test/run_all_unittests.cc',
-
- '<@(auto_login_parser_unittest_sources)',
- '<@(autofill_unittest_sources)',
- '<@(bookmarks_unittest_sources)',
- '<@(browser_watcher_unittest_sources)',
- '<@(captive_portal_unittest_sources)',
- '<@(cloud_devices_unittest_sources)',
- '<@(content_settings_unittest_sources)',
- '<@(crash_unittest_sources)',
- '<@(crx_file_unittest_sources)',
- '<@(data_reduction_proxy_unittest_sources)',
- '<@(device_event_log_unittest_sources)',
- '<@(dom_distiller_unittest_sources)',
- '<@(domain_reliability_unittest_sources)',
- '<@(enhanced_bookmarks_unittest_sources)',
- '<@(favicon_base_unittest_sources)',
- '<@(gcm_driver_unittest_sources)',
- '<@(google_unittest_sources)',
- '<@(history_unittest_sources)',
- '<@(json_schema_unittest_sources)',
- '<@(keyed_service_unittest_sources)',
- '<@(language_usage_metrics_unittest_sources)',
- '<@(leveldb_proto_unittest_sources)',
- '<@(login_unittest_sources)',
- '<@(metrics_unittest_sources)',
- '<@(network_time_unittest_sources)',
- '<@(omnibox_unittest_sources)',
- '<@(os_crypt_unittest_sources)',
- '<@(ownership_unittest_sources)',
- '<@(packed_ct_ev_whitelist_unittest_sources)',
- '<@(password_manager_unittest_sources)',
- '<@(precache_unittest_sources)',
- '<@(query_parser_unittest_sources)',
- '<@(rappor_unittest_sources)',
- '<@(search_unittest_sources)',
- '<@(search_provider_logos_unittest_sources)',
- '<@(sessions_unittest_sources)',
- '<@(signin_unittest_sources)',
- '<@(suggestions_unittest_sources)',
- '<@(sync_driver_unittest_sources)',
- '<@(translate_unittest_sources)',
- '<@(update_client_unittest_sources)',
- '<@(url_fixer_unittest_sources)',
- '<@(url_matcher_unittest_sources)',
- '<@(variations_unittest_sources)',
- '<@(wallpaper_unittest_sources)',
- '<@(web_resource_unittest_sources)',
- '<@(webdata_unittest_sources)',
+ '<@(cronet_unittest_sources)',
+ 'data_reduction_proxy/content/browser/data_reduction_proxy_debug_blocking_page_unittest.cc',
+ 'data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc',
+ 'data_reduction_proxy/content/browser/data_reduction_proxy_debug_ui_manager_unittest.cc',
+ 'invalidation/invalidation_logger_unittest.cc',
+ 'invalidation/invalidation_service_android_unittest.cc',
],
- 'include_dirs': [
- '..',
+ 'sources!': [
+ 'gcm_driver/gcm_account_mapper_unittest.cc',
+ 'gcm_driver/gcm_channel_status_request_unittest.cc',
+ 'gcm_driver/gcm_client_impl_unittest.cc',
+ 'gcm_driver/gcm_delayed_task_controller_unittest.cc',
+ 'gcm_driver/gcm_driver_desktop_unittest.cc',
+ 'gcm_driver/gcm_stats_recorder_impl_unittest.cc',
+ 'sessions/session_backend_unittest.cc',
+ 'signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc',
+ 'storage_monitor/media_storage_util_unittest.cc',
+ 'storage_monitor/storage_info_unittest.cc',
+ 'storage_monitor/storage_monitor_unittest.cc',
+ 'web_modal/web_contents_modal_dialog_manager_unittest.cc',
],
'dependencies': [
- '../base/base.gyp:base',
- '../base/base.gyp:base_prefs_test_support',
- '../base/base.gyp:test_support_base',
- # TODO(blundell): Eliminate the need for this dependency in code
- # that iOS shares. crbug.com/325243
- '../content/content_shell_and_tests.gyp:test_support_content',
+ 'components.gyp:cronet_static',
+ 'components.gyp:data_reduction_proxy_content',
+ '../testing/android/native_test.gyp:native_test_native_code',
+ ],
+ 'dependencies!': [
+ 'components.gyp:storage_monitor',
+ 'components.gyp:storage_monitor_test_support',
+ 'components.gyp:web_modal',
+ 'components.gyp:web_modal_test_support',
+ ],
+ }],
+ ['OS != "android"', {
+ 'sources': [
+ '<@(invalidation_unittest_sources)',
+ ],
+ }],
+ ['OS != "ios" and OS != "android"', {
+ 'sources': [
+ '<@(audio_modem_unittest_sources)',
+ '<@(copresence_unittest_sources)',
+ '<@(feedback_unittest_sources)',
+ '<@(proximity_auth_unittest_sources)',
+ ],
+ 'dependencies': [
+ '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
'../google_apis/google_apis.gyp:google_apis_test_support',
- '../jingle/jingle.gyp:notifier_test_util',
- '../net/net.gyp:net_test_support',
- '../sql/sql.gyp:test_support_sql',
- '../sync/sync.gyp:sync',
- '../sync/sync.gyp:test_support_sync_api',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
- '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
- '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util',
- '../third_party/libjingle/libjingle.gyp:libjingle',
- '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
- '../third_party/libxml/libxml.gyp:libxml',
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
- '../ui/base/ui_base.gyp:ui_base',
- '../ui/gfx/gfx.gyp:gfx',
- '../ui/gfx/gfx.gyp:gfx_test_support',
- '../ui/resources/ui_resources.gyp:ui_resources',
- '../ui/strings/ui_strings.gyp:ui_strings',
- '../url/url.gyp:url_lib',
- 'components.gyp:auto_login_parser',
- 'components.gyp:autofill_core_browser',
- 'components.gyp:autofill_core_common',
- 'components.gyp:autofill_core_test_support',
- 'components.gyp:bookmarks_browser',
- 'components.gyp:bookmarks_managed',
- 'components.gyp:bookmarks_test_support',
- 'components.gyp:captive_portal_test_support',
- 'components.gyp:cloud_devices_common',
- 'components.gyp:content_settings_core_browser',
- 'components.gyp:content_settings_core_common',
- 'components.gyp:content_settings_core_test_support',
- 'components.gyp:crash_test_support',
- 'components.gyp:crx_file',
- 'components.gyp:data_reduction_proxy_core_browser',
- 'components.gyp:data_reduction_proxy_core_common',
- 'components.gyp:data_reduction_proxy_test_support',
- 'components.gyp:device_event_log_component',
- 'components.gyp:dom_distiller_core',
- 'components.gyp:dom_distiller_protos',
- 'components.gyp:dom_distiller_test_support',
- 'components.gyp:domain_reliability',
- 'components.gyp:enhanced_bookmarks',
- 'components.gyp:enhanced_bookmarks_test_support',
- 'components.gyp:favicon_base',
- 'components.gyp:gcm_driver',
- 'components.gyp:gcm_driver_test_support',
- 'components.gyp:google_core_browser',
- 'components.gyp:history_core_browser',
- 'components.gyp:history_core_common',
- 'components.gyp:history_core_test_support',
- 'components.gyp:invalidation',
- 'components.gyp:invalidation_test_support',
- 'components.gyp:json_schema',
- 'components.gyp:keyed_service_core',
- 'components.gyp:language_usage_metrics',
- 'components.gyp:leveldb_proto',
- 'components.gyp:leveldb_proto_test_support',
- 'components.gyp:login',
- 'components.gyp:metrics',
- 'components.gyp:metrics_gpu',
- 'components.gyp:metrics_net',
- 'components.gyp:metrics_profiler',
- 'components.gyp:metrics_test_support',
- 'components.gyp:network_time',
- 'components.gyp:omnibox',
- 'components.gyp:omnibox_test_support',
- 'components.gyp:os_crypt',
- 'components.gyp:ownership',
- 'components.gyp:packed_ct_ev_whitelist',
- 'components.gyp:password_manager_core_browser',
- 'components.gyp:password_manager_core_browser',
- 'components.gyp:password_manager_core_browser_test_support',
- 'components.gyp:precache_core',
- 'components.gyp:pref_registry_test_support',
- 'components.gyp:query_parser',
- 'components.gyp:rappor',
- 'components.gyp:rappor_test_support',
- 'components.gyp:search',
- 'components.gyp:search_engines',
- 'components.gyp:search_engines_test_support',
- 'components.gyp:search_provider_logos',
- 'components.gyp:sessions_test_support',
- 'components.gyp:signin_core_browser',
- 'components.gyp:signin_core_browser_test_support',
- 'components.gyp:suggestions',
- 'components.gyp:sync_driver_test_support',
- 'components.gyp:translate_core_browser',
- 'components.gyp:translate_core_common',
- 'components.gyp:translate_core_language_detection',
- 'components.gyp:ui_zoom',
- 'components.gyp:update_client',
- 'components.gyp:update_client_test_support',
- 'components.gyp:url_fixer',
- 'components.gyp:variations',
- 'components.gyp:variations_http_provider',
- 'components.gyp:wallpaper',
- 'components.gyp:web_resource',
- 'components.gyp:web_resource_test_support',
- 'components_resources.gyp:components_resources',
- 'components_strings.gyp:components_strings',
- 'components_tests_pak',
+ 'components.gyp:audio_modem',
+ 'components.gyp:audio_modem_test_support',
+ 'components.gyp:copresence',
+ 'components.gyp:copresence_test_support',
+ 'components.gyp:cryptauth',
+ 'components.gyp:cryptauth_test_support',
+ 'components.gyp:feedback_component',
+ 'components.gyp:proximity_auth',
+ ],
+ }],
+ ['chromeos==1', {
+ 'sources': [
+ 'pairing/message_buffer_unittest.cc',
+ 'timers/alarm_timer_unittest.cc',
+ 'wifi_sync/wifi_config_delegate_chromeos_unittest.cc',
+ 'wifi_sync/wifi_credential_syncable_service_unittest.cc',
+ 'wifi_sync/wifi_credential_unittest.cc',
+ 'wifi_sync/wifi_security_class_chromeos_unittest.cc',
+ 'wifi_sync/wifi_security_class_unittest.cc',
+ ],
+ 'sources!': [
+ 'storage_monitor/storage_monitor_linux_unittest.cc',
+ ],
+ 'dependencies': [
+ '../chromeos/chromeos.gyp:chromeos_test_support',
+ 'components.gyp:pairing',
+ 'components.gyp:user_manager_test_support',
+ 'components.gyp:wifi_sync',
+ ],
+ }],
+ ['OS=="linux"', {
+ 'sources': [
+ 'metrics/serialization/serialization_utils_unittest.cc',
+ ],
+ 'dependencies': [
+ 'components.gyp:metrics_serialization',
+ '../dbus/dbus.gyp:dbus',
+ '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
+ ],
+ }],
+ ['OS=="linux" and use_udev==0', {
+ 'dependencies!': [
+ 'components.gyp:storage_monitor',
+ 'components.gyp:storage_monitor_test_support',
+ ],
+ 'sources/': [
+ ['exclude', '^storage_monitor/'],
+ ],
+ }],
+ ['OS=="win" and win_use_allocator_shim==1', {
+ 'dependencies': [
+ '../base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ['OS=="linux" and component=="shared_library" and use_allocator!="none"', {
+ 'dependencies': [
+ '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+ ],
+ 'link_settings': {
+ 'ldflags': ['-rdynamic'],
+ },
+ }],
+ ['configuration_policy==1', {
+ 'dependencies': [
+ 'components.gyp:policy_component',
+ 'components.gyp:policy_component_test_support',
+ 'components.gyp:policy_test_support',
+ ],
+ 'sources': [
+ '<@(policy_unittest_sources)',
+ 'search_engines/default_search_policy_handler_unittest.cc',
],
'conditions': [
- ['toolkit_views == 1', {
- 'sources': [
- 'bookmarks/browser/bookmark_node_data_unittest.cc',
- 'constrained_window/constrained_window_views_unittest.cc',
- ],
- 'dependencies': [
- '<(DEPTH)/ui/views/views.gyp:views_test_support',
- 'components.gyp:constrained_window',
- ]
- }],
- ['OS=="win"', {
- 'dependencies': [
- 'components.gyp:browser_watcher',
- 'components.gyp:browser_watcher_client',
- ]
- }],
- ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
- 'dependencies': [
- '<(DEPTH)/base/allocator/allocator.gyp:allocator',
- ],
- }],
- [ 'cld_version==0 or cld_version==2', {
- 'dependencies': [
- # Unit tests should always use statically-linked CLD data.
- '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ],
- }],
- ['OS != "ios"', {
- 'sources': [
- '<@(error_page_unittest_sources)',
- '<@(navigation_interception_unittest_sources)',
- '<@(network_hints_unittest_sources)',
- '<@(power_unittest_sources)',
- '<@(storage_monitor_unittest_sources)',
- '<@(ui_unittest_sources)',
- '<@(visitedlink_unittest_sources)',
- '<@(web_cache_unittest_sources)',
- '<@(web_modal_unittest_sources)',
- ],
- 'dependencies': [
- '../skia/skia.gyp:skia',
- 'components.gyp:autofill_content_browser',
- 'components.gyp:autofill_content_renderer',
- 'components.gyp:autofill_content_test_support',
- 'components.gyp:data_reduction_proxy_content_browser',
- 'components.gyp:dom_distiller_content',
- 'components.gyp:error_page_renderer',
- 'components.gyp:history_content_browser',
- 'components.gyp:keyed_service_content',
- 'components.gyp:navigation_interception',
- 'components.gyp:network_hints_renderer',
- 'components.gyp:password_manager_content_browser',
- 'components.gyp:password_manager_content_common',
- 'components.gyp:power',
- 'components.gyp:precache_content',
- 'components.gyp:sessions_content',
- 'components.gyp:storage_monitor',
- 'components.gyp:storage_monitor_test_support',
- 'components.gyp:url_matcher',
- 'components.gyp:visitedlink_browser',
- 'components.gyp:visitedlink_renderer',
- 'components.gyp:web_cache_browser',
- 'components.gyp:web_modal',
- 'components.gyp:web_modal_test_support',
- ],
- }, { # 'OS == "ios"'
- 'sources': [
- 'open_from_clipboard/clipboard_recent_content_ios_unittest.mm',
- 'webp_transcode/webp_decoder_unittest.mm',
- 'webp_transcode/webp_network_client_unittest.mm',
- ],
- 'sources!': [
- 'metrics/gpu/gpu_metrics_provider_unittest.cc',
- 'signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc',
- ],
+ ['OS=="android"', {
'sources/': [
- # Exclude all tests that depends on //content (based on layered-
- # component directory structure).
- ['exclude', '^[^/]*/content/'],
- ],
- 'dependencies': [
- '../ios/ios_tests.gyp:test_support_ios',
- '../ios/web/ios_web.gyp:test_support_ios_web',
- '../third_party/ocmock/ocmock.gyp:ocmock',
- 'components.gyp:open_from_clipboard',
- 'components.gyp:sessions_ios',
- 'components.gyp:signin_ios_browser',
- 'components.gyp:translate_ios_browser',
- 'components.gyp:webp_transcode',
- ],
- 'actions': [
- {
- 'action_name': 'copy_test_data',
- 'variables': {
- 'test_data_files': [
- 'test/data',
- ],
- 'test_data_prefix': 'components',
- },
- 'includes': [ '../build/copy_test_data_ios.gypi' ],
- },
- ],
- 'conditions': [
- ['configuration_policy==1', {
- 'sources/': [
- ['include', '^policy/'],
- ],
- }],
- ],
- }],
- ['disable_nacl==0', {
- 'sources': [
- '<@(nacl_unittest_sources)',
- ],
- 'dependencies': [
- 'nacl.gyp:nacl_browser',
- 'nacl.gyp:nacl_common',
- ],
- }],
- ['OS == "mac"', {
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/AddressBook.framework',
- '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
- '$(SDKROOT)/System/Library/Frameworks/ImageCaptureCore.framework',
- ],
- },
- 'sources!': [
- 'password_manager/core/browser/password_store_default_unittest.cc',
- ],
- }],
- ['OS == "android"', {
- 'sources': [
- '<@(cronet_unittest_sources)',
- 'data_reduction_proxy/content/browser/data_reduction_proxy_debug_blocking_page_unittest.cc',
- 'data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc',
- 'data_reduction_proxy/content/browser/data_reduction_proxy_debug_ui_manager_unittest.cc',
- 'invalidation/invalidation_logger_unittest.cc',
- 'invalidation/invalidation_service_android_unittest.cc',
- ],
- 'sources!': [
- 'gcm_driver/gcm_account_mapper_unittest.cc',
- 'gcm_driver/gcm_channel_status_request_unittest.cc',
- 'gcm_driver/gcm_client_impl_unittest.cc',
- 'gcm_driver/gcm_delayed_task_controller_unittest.cc',
- 'gcm_driver/gcm_driver_desktop_unittest.cc',
- 'gcm_driver/gcm_stats_recorder_impl_unittest.cc',
- 'sessions/session_backend_unittest.cc',
- 'signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc',
- 'storage_monitor/media_storage_util_unittest.cc',
- 'storage_monitor/storage_info_unittest.cc',
- 'storage_monitor/storage_monitor_unittest.cc',
- 'web_modal/web_contents_modal_dialog_manager_unittest.cc',
- ],
- 'dependencies': [
- 'components.gyp:cronet_static',
- 'components.gyp:data_reduction_proxy_content',
- '../testing/android/native_test.gyp:native_test_native_code',
- ],
- 'dependencies!': [
- 'components.gyp:storage_monitor',
- 'components.gyp:storage_monitor_test_support',
- 'components.gyp:web_modal',
- 'components.gyp:web_modal_test_support',
- ],
- }],
- ['OS != "android"', {
- 'sources': [
- '<@(invalidation_unittest_sources)',
+ ['exclude', '^policy/core/common/async_policy_provider_unittest\\.cc'],
],
}],
- ['OS != "ios" and OS != "android"', {
- 'sources': [
- '<@(audio_modem_unittest_sources)',
- '<@(copresence_unittest_sources)',
- '<@(feedback_unittest_sources)',
- '<@(proximity_auth_unittest_sources)',
- ],
- 'dependencies': [
- '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
- '../google_apis/google_apis.gyp:google_apis_test_support',
- '../third_party/protobuf/protobuf.gyp:protobuf_lite',
- 'components.gyp:audio_modem',
- 'components.gyp:audio_modem_test_support',
- 'components.gyp:copresence',
- 'components.gyp:copresence_test_support',
- 'components.gyp:cryptauth',
- 'components.gyp:cryptauth_test_support',
- 'components.gyp:feedback_component',
- 'components.gyp:proximity_auth',
+ ['OS=="android" or OS=="ios"', {
+ # Note: 'sources!' is processed before any 'sources/', so the
+ # ['include', '^policy/'] on iOS above will include all of the
+ # policy source files again. Using 'source/' here too will get
+ # these files excluded as expected.
+ 'sources/': [
+ ['exclude', '^policy/core/common/cloud/component_cloud_policy_service_unittest\\.cc'],
+ ['exclude', '^policy/core/common/cloud/component_cloud_policy_store_unittest\\.cc'],
+ ['exclude', '^policy/core/common/cloud/component_cloud_policy_updater_unittest\\.cc'],
+ ['exclude', '^policy/core/common/cloud/external_policy_data_fetcher_unittest\\.cc'],
+ ['exclude', '^policy/core/common/cloud/external_policy_data_updater_unittest\\.cc'],
+ ['exclude', '^policy/core/common/cloud/resource_cache_unittest\\.cc'],
+ ['exclude', '^policy/core/common/config_dir_policy_loader_unittest\\.cc'],
],
}],
['chromeos==1', {
'sources': [
- 'pairing/message_buffer_unittest.cc',
- 'timers/alarm_timer_unittest.cc',
- 'wifi_sync/wifi_config_delegate_chromeos_unittest.cc',
- 'wifi_sync/wifi_credential_syncable_service_unittest.cc',
- 'wifi_sync/wifi_credential_unittest.cc',
- 'wifi_sync/wifi_security_class_chromeos_unittest.cc',
- 'wifi_sync/wifi_security_class_unittest.cc',
+ 'policy/core/common/proxy_policy_provider_unittest.cc',
],
'sources!': [
- 'storage_monitor/storage_monitor_linux_unittest.cc',
- ],
- 'dependencies': [
- '../chromeos/chromeos.gyp:chromeos_test_support',
- 'components.gyp:pairing',
- 'components.gyp:user_manager_test_support',
- 'components.gyp:wifi_sync',
- ],
- }],
- ['OS=="linux"', {
- 'sources': [
- 'metrics/serialization/serialization_utils_unittest.cc',
- ],
- 'dependencies': [
- 'components.gyp:metrics_serialization',
- '../dbus/dbus.gyp:dbus',
- '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
- ],
- }],
- ['OS=="linux" and use_udev==0', {
- 'dependencies!': [
- 'components.gyp:storage_monitor',
- 'components.gyp:storage_monitor_test_support',
- ],
- 'sources/': [
- ['exclude', '^storage_monitor/'],
+ 'policy/core/common/cloud/user_cloud_policy_manager_unittest.cc',
+ 'policy/core/common/cloud/user_cloud_policy_store_unittest.cc',
],
}],
- ['OS=="win" and win_use_allocator_shim==1', {
- 'dependencies': [
- '../base/allocator/allocator.gyp:allocator',
- ],
- }],
- ['OS=="linux" and component=="shared_library" and use_allocator!="none"', {
- 'dependencies': [
- '<(DEPTH)/base/allocator/allocator.gyp:allocator',
- ],
- 'link_settings': {
- 'ldflags': ['-rdynamic'],
- },
- }],
- ['configuration_policy==1', {
- 'dependencies': [
- 'components.gyp:policy_component',
- 'components.gyp:policy_component_test_support',
- 'components.gyp:policy_test_support',
- ],
+ ['OS=="ios" or OS=="mac"', {
'sources': [
- '<@(policy_unittest_sources)',
- 'search_engines/default_search_policy_handler_unittest.cc',
- ],
- 'conditions': [
- ['OS=="android"', {
- 'sources/': [
- ['exclude', '^policy/core/common/async_policy_provider_unittest\\.cc'],
- ],
- }],
- ['OS=="android" or OS=="ios"', {
- # Note: 'sources!' is processed before any 'sources/', so the
- # ['include', '^policy/'] on iOS above will include all of the
- # policy source files again. Using 'source/' here too will get
- # these files excluded as expected.
- 'sources/': [
- ['exclude', '^policy/core/common/cloud/component_cloud_policy_service_unittest\\.cc'],
- ['exclude', '^policy/core/common/cloud/component_cloud_policy_store_unittest\\.cc'],
- ['exclude', '^policy/core/common/cloud/component_cloud_policy_updater_unittest\\.cc'],
- ['exclude', '^policy/core/common/cloud/external_policy_data_fetcher_unittest\\.cc'],
- ['exclude', '^policy/core/common/cloud/external_policy_data_updater_unittest\\.cc'],
- ['exclude', '^policy/core/common/cloud/resource_cache_unittest\\.cc'],
- ['exclude', '^policy/core/common/config_dir_policy_loader_unittest\\.cc'],
- ],
- }],
- ['chromeos==1', {
- 'sources': [
- 'policy/core/common/proxy_policy_provider_unittest.cc',
- ],
- 'sources!': [
- 'policy/core/common/cloud/user_cloud_policy_manager_unittest.cc',
- 'policy/core/common/cloud/user_cloud_policy_store_unittest.cc',
- ],
- }],
- ['OS=="ios" or OS=="mac"', {
- 'sources': [
- 'policy/core/common/mac_util_unittest.cc',
- ],
- }],
+ 'policy/core/common/mac_util_unittest.cc',
],
}],
],
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
- 'msvs_disabled_warnings': [4267, ],
- },
+ }],
],
- }],
- ['OS != "ios" and android_webview_build == 0', {
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
+ },
+ ],
+ 'conditions': [
+ ['OS != "ios"', {
'targets': [
{
# GN: //components:components_perftests
@@ -1080,52 +1078,6 @@
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
},
- ],
- 'conditions': [
- ['OS == "android"', {
- 'targets': [
- {
- 'target_name': 'components_unittests_apk',
- 'type': 'none',
- 'dependencies': [
- 'components_unittests',
- 'components.gyp:invalidation_java',
- ],
- 'variables': {
- 'test_suite_name': 'components_unittests',
- },
- 'includes': [ '../build/apk_test.gypi' ],
- },
- ],
- }],
- ],
- }],
- ['OS!="ios"', {
- 'conditions': [
- ['test_isolation_mode != "noop"', {
- 'targets': [
- {
- 'target_name': 'components_browsertests_run',
- 'type': 'none',
- 'dependencies': [ 'components_browsertests' ],
- 'includes': [
- '../build/isolate.gypi',
- ],
- 'sources': [
- 'components_browsertests.isolate',
- ],
- 'conditions': [
- ['use_x11==1', {
- 'dependencies': [
- '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
- ],
- }],
- ],
- },
- ],
- }],
- ],
- 'targets': [
{
'target_name': 'components_browsertests',
'type': '<(gtest_target_type)',
@@ -1221,7 +1173,7 @@
}],
['OS=="mac"', {
'dependencies': [
- '../content/content_shell_and_tests.gyp:content_shell', # Needed for Content Shell.app's Helper.
+ '../content/content_shell_and_tests.gyp:content_shell', # Needed for Content Shell.app's Helper.
],
}],
['enable_basic_printing==1 or enable_print_preview==1', {
@@ -1235,6 +1187,30 @@
],
},
],
+ 'conditions': [
+ ['test_isolation_mode != "noop"', {
+ 'targets': [
+ {
+ 'target_name': 'components_browsertests_run',
+ 'type': 'none',
+ 'dependencies': [ 'components_browsertests' ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'components_browsertests.isolate',
+ ],
+ 'conditions': [
+ ['use_x11==1', {
+ 'dependencies': [
+ '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+ ],
+ }],
+ ],
+ },
+ ],
+ }],
+ ],
}],
['test_isolation_mode != "noop"', {
'targets': [
@@ -1260,5 +1236,21 @@
},
],
}],
+ ['OS == "android"', {
+ 'targets': [
+ {
+ 'target_name': 'components_unittests_apk',
+ 'type': 'none',
+ 'dependencies': [
+ 'components_unittests',
+ 'components.gyp:invalidation_java',
+ ],
+ 'variables': {
+ 'test_suite_name': 'components_unittests',
+ },
+ 'includes': [ '../build/apk_test.gypi' ],
+ },
+ ],
+ }],
],
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698