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

Side by Side Diff: components/components_tests.gyp

Issue 900223003: components: Provide an unified target to generate components_tests_resources.pak. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « components/components_browsertests.isolate ('k') | components/components_unittests.isolate » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 # This turns on e.g. the filename-based detection of which 7 # This turns on e.g. the filename-based detection of which
8 # platforms to include source files on (e.g. files ending in 8 # platforms to include source files on (e.g. files ending in
9 # _mac.h or _mac.cc are only compiled on MacOSX). 9 # _mac.h or _mac.cc are only compiled on MacOSX).
10 'chromium_code': 1, 10 'chromium_code': 1,
11 }, 11 },
12 'conditions': [ 12 'conditions': [
13 ['android_webview_build == 0', { 13 ['android_webview_build == 0', {
14 'targets': [ 14 'targets': [
15 { 15 {
16 'target_name': 'components_tests_pak',
17 'type': 'none',
18 'dependencies': [
19 '../ui/resources/ui_resources.gyp:ui_resources',
20 '../ui/strings/ui_strings.gyp:ui_strings',
21 'components_resources.gyp:components_resources',
22 'components_strings.gyp:components_strings',
23 ],
24 'actions': [
25 {
26 'action_name': 'repack_components_tests_pak',
27 'variables': {
28 'pak_inputs': [
29 '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pa k',
30 '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_stri ngs_en-US.pak',
31 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_perc ent.pak',
32 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en- US.pak',
33 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
34 ],
35 'pak_output': '<(PRODUCT_DIR)/components_tests_resources.pak',
36 },
37 'includes': [ '../build/repack_action.gypi' ],
38 },
39 ],
40 'direct_dependent_settings': {
41 'mac_bundle_resources': [
42 '<(PRODUCT_DIR)/components_tests_resources.pak',
43 ],
44 },
45 },
46 {
16 # GN version: //components/components_unittests 47 # GN version: //components/components_unittests
17 'target_name': 'components_unittests', 48 'target_name': 'components_unittests',
18 'type': '<(gtest_target_type)', 49 'type': '<(gtest_target_type)',
19 'sources': [ 50 'sources': [
20 # Note: sources list duplicated in GN build. In the GN build, 51 # Note: sources list duplicated in GN build. In the GN build,
21 # each component has its own unit tests target defined in its 52 # each component has its own unit tests target defined in its
22 # directory that are then linked into the final content_unittests. 53 # directory that are then linked into the final content_unittests.
23 'auto_login_parser/auto_login_parser_unittest.cc', 54 'auto_login_parser/auto_login_parser_unittest.cc',
24 'autofill/content/browser/content_autofill_driver_unittest.cc', 55 'autofill/content/browser/content_autofill_driver_unittest.cc',
25 'autofill/content/browser/request_autocomplete_manager_unittest.cc', 56 'autofill/content/browser/request_autocomplete_manager_unittest.cc',
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 'components.gyp:update_client', 445 'components.gyp:update_client',
415 'components.gyp:update_client_test_support', 446 'components.gyp:update_client_test_support',
416 'components.gyp:url_fixer', 447 'components.gyp:url_fixer',
417 'components.gyp:variations', 448 'components.gyp:variations',
418 'components.gyp:variations_http_provider', 449 'components.gyp:variations_http_provider',
419 'components.gyp:wallpaper', 450 'components.gyp:wallpaper',
420 'components.gyp:web_resource', 451 'components.gyp:web_resource',
421 'components.gyp:web_resource_test_support', 452 'components.gyp:web_resource_test_support',
422 'components_resources.gyp:components_resources', 453 'components_resources.gyp:components_resources',
423 'components_strings.gyp:components_strings', 454 'components_strings.gyp:components_strings',
424 ], 455 'components_tests_pak',
425 'actions': [
426 {
427 'action_name': 'repack_components_pak',
428 'variables': {
429 'pak_inputs': [
430 '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pa k',
431 '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_stri ngs_en-US.pak',
432 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_perc ent.pak',
433 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en- US.pak',
434 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
435 ],
436 'pak_output': '<(PRODUCT_DIR)/components_unittests_resources.pak ',
437 },
438 'includes': [ '../build/repack_action.gypi' ],
439 },
440 ],
441 'mac_bundle_resources': [
442 '<(PRODUCT_DIR)/components_unittests_resources.pak',
443 ], 456 ],
444 'conditions': [ 457 'conditions': [
445 ['toolkit_views == 1', { 458 ['toolkit_views == 1', {
446 'sources': [ 459 'sources': [
447 'bookmarks/browser/bookmark_node_data_unittest.cc', 460 'bookmarks/browser/bookmark_node_data_unittest.cc',
448 'constrained_window/constrained_window_views_unittest.cc', 461 'constrained_window/constrained_window_views_unittest.cc',
449 ], 462 ],
450 'dependencies': [ 463 'dependencies': [
451 '<(DEPTH)/ui/views/views.gyp:views_test_support', 464 '<(DEPTH)/ui/views/views.gyp:views_test_support',
452 'components.gyp:constrained_window', 465 'components.gyp:constrained_window',
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 '../testing/gmock.gyp:gmock', 957 '../testing/gmock.gyp:gmock',
945 '../testing/gtest.gyp:gtest', 958 '../testing/gtest.gyp:gtest',
946 'components.gyp:autofill_content_browser', 959 'components.gyp:autofill_content_browser',
947 'components.gyp:autofill_content_renderer', 960 'components.gyp:autofill_content_renderer',
948 'components.gyp:dom_distiller_content', 961 'components.gyp:dom_distiller_content',
949 'components.gyp:dom_distiller_core', 962 'components.gyp:dom_distiller_core',
950 'components.gyp:password_manager_content_renderer', 963 'components.gyp:password_manager_content_renderer',
951 'components.gyp:pref_registry_test_support', 964 'components.gyp:pref_registry_test_support',
952 'components_resources.gyp:components_resources', 965 'components_resources.gyp:components_resources',
953 'components_strings.gyp:components_strings', 966 'components_strings.gyp:components_strings',
967 'components_tests_pak',
954 ], 968 ],
955 'include_dirs': [ 969 'include_dirs': [
956 '..', 970 '..',
957 ], 971 ],
958 'defines': [ 972 'defines': [
959 'HAS_OUT_OF_PROC_TEST_RUNNER', 973 'HAS_OUT_OF_PROC_TEST_RUNNER',
960 ], 974 ],
961 'sources': [ 975 'sources': [
962 'autofill/content/browser/risk/fingerprint_browsertest.cc', 976 'autofill/content/browser/risk/fingerprint_browsertest.cc',
963 'autofill/content/renderer/password_form_conversion_utils_browsertes t.cc', 977 'autofill/content/renderer/password_form_conversion_utils_browsertes t.cc',
964 'dom_distiller/content/distiller_page_web_contents_browsertest.cc', 978 'dom_distiller/content/distiller_page_web_contents_browsertest.cc',
965 'password_manager/content/renderer/credential_manager_client_browser test.cc', 979 'password_manager/content/renderer/credential_manager_client_browser test.cc',
966 ], 980 ],
967 'actions': [
968 {
969 'action_name': 'repack_components_pak',
970 'variables': {
971 'pak_inputs': [
972 '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pa k',
973 '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_stri ngs_en-US.pak',
974 ],
975 'pak_output': '<(PRODUCT_DIR)/components_resources.pak',
976 },
977 'includes': [ '../build/repack_action.gypi' ],
978 },
979 ],
980 'conditions': [ 981 'conditions': [
981 ['OS == "android"', { 982 ['OS == "android"', {
982 'sources!': [ 983 'sources!': [
983 'autofill/content/browser/risk/fingerprint_browsertest.cc', 984 'autofill/content/browser/risk/fingerprint_browsertest.cc',
984 ], 985 ],
985 }], 986 }],
986 ['OS == "linux"', { 987 ['OS == "linux"', {
987 'sources': [ 988 'sources': [
988 # content_extractor is a standalone content extraction tool bu ilt as 989 # content_extractor is a standalone content extraction tool bu ilt as
989 # a MANUAL component_browsertest. 990 # a MANUAL component_browsertest.
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
1060 '../build/isolate.gypi', 1061 '../build/isolate.gypi',
1061 ], 1062 ],
1062 'sources': [ 1063 'sources': [
1063 'components_unittests.isolate', 1064 'components_unittests.isolate',
1064 ], 1065 ],
1065 }, 1066 },
1066 ], 1067 ],
1067 }], 1068 }],
1068 ], 1069 ],
1069 } 1070 }
OLDNEW
« no previous file with comments | « components/components_browsertests.isolate ('k') | components/components_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698