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

Side by Side Diff: components/components_tests.gyp

Issue 1115033003: resources: Prevent including the same resource in multiple pack files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge Created 5 years, 7 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/BUILD.gn ('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,
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 'webdata_unittest_sources': [ 613 'webdata_unittest_sources': [
614 'webdata/common/web_database_migration_unittest.cc', 614 'webdata/common/web_database_migration_unittest.cc',
615 ], 615 ],
616 }, 616 },
617 'targets': [ 617 'targets': [
618 { 618 {
619 # GN version: //components:components_tests_pak 619 # GN version: //components:components_tests_pak
620 'target_name': 'components_tests_pak', 620 'target_name': 'components_tests_pak',
621 'type': 'none', 621 'type': 'none',
622 'dependencies': [ 622 'dependencies': [
623 '../ui/resources/ui_resources.gyp:ui_resources',
624 '../ui/strings/ui_strings.gyp:ui_strings',
625 'components_resources.gyp:components_resources', 623 'components_resources.gyp:components_resources',
626 'components_strings.gyp:components_strings', 624 'components_strings.gyp:components_strings',
627 ], 625 ],
628 'actions': [ 626 'actions': [
629 { 627 {
630 'action_name': 'repack_components_tests_pak', 628 'action_name': 'repack_components_tests_pak',
631 'variables': { 629 'variables': {
632 'pak_inputs': [ 630 'pak_inputs': [
633 '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak', 631 '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak',
634 '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_ en-US.pak', 632 '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_ en-US.pak',
635 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak',
636 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
637 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.p ak',
638 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
639 ], 633 ],
640 'pak_output': '<(PRODUCT_DIR)/components_tests_resources.pak', 634 'pak_output': '<(PRODUCT_DIR)/components_tests_resources.pak',
641 }, 635 },
642 'includes': [ '../build/repack_action.gypi' ], 636 'includes': [ '../build/repack_action.gypi' ],
643 }, 637 },
644 ], 638 ],
645 'direct_dependent_settings': { 639 'direct_dependent_settings': {
646 'mac_bundle_resources': [ 640 'mac_bundle_resources': [
647 '<(PRODUCT_DIR)/components_tests_resources.pak', 641 '<(PRODUCT_DIR)/components_tests_resources.pak',
648 ], 642 ],
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 722 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
729 '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util ', 723 '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util ',
730 '../third_party/libjingle/libjingle.gyp:libjingle', 724 '../third_party/libjingle/libjingle.gyp:libjingle',
731 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', 725 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
732 '../third_party/libxml/libxml.gyp:libxml', 726 '../third_party/libxml/libxml.gyp:libxml',
733 '../third_party/protobuf/protobuf.gyp:protobuf_lite', 727 '../third_party/protobuf/protobuf.gyp:protobuf_lite',
734 '../ui/base/ui_base.gyp:ui_base', 728 '../ui/base/ui_base.gyp:ui_base',
735 '../ui/gfx/gfx.gyp:gfx', 729 '../ui/gfx/gfx.gyp:gfx',
736 '../ui/gfx/gfx.gyp:gfx_test_support', 730 '../ui/gfx/gfx.gyp:gfx_test_support',
737 '../ui/resources/ui_resources.gyp:ui_resources', 731 '../ui/resources/ui_resources.gyp:ui_resources',
732 '../ui/resources/ui_resources.gyp:ui_test_pak',
738 '../ui/strings/ui_strings.gyp:ui_strings', 733 '../ui/strings/ui_strings.gyp:ui_strings',
739 '../url/url.gyp:url_lib', 734 '../url/url.gyp:url_lib',
740 'components.gyp:auto_login_parser', 735 'components.gyp:auto_login_parser',
741 'components.gyp:autofill_core_browser', 736 'components.gyp:autofill_core_browser',
742 'components.gyp:autofill_core_common', 737 'components.gyp:autofill_core_common',
743 'components.gyp:autofill_core_test_support', 738 'components.gyp:autofill_core_test_support',
744 'components.gyp:bookmarks_browser', 739 'components.gyp:bookmarks_browser',
745 'components.gyp:bookmarks_managed', 740 'components.gyp:bookmarks_managed',
746 'components.gyp:bookmarks_test_support', 741 'components.gyp:bookmarks_test_support',
747 'components.gyp:captive_portal_test_support', 742 'components.gyp:captive_portal_test_support',
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 ], 928 ],
934 'sources!': [ 929 'sources!': [
935 'metrics/gpu/gpu_metrics_provider_unittest.cc', 930 'metrics/gpu/gpu_metrics_provider_unittest.cc',
936 'signin/core/browser/mutable_profile_oauth2_token_service_unittest.c c', 931 'signin/core/browser/mutable_profile_oauth2_token_service_unittest.c c',
937 ], 932 ],
938 'sources/': [ 933 'sources/': [
939 # Exclude all tests that depends on //content (based on layered- 934 # Exclude all tests that depends on //content (based on layered-
940 # component directory structure). 935 # component directory structure).
941 ['exclude', '^[^/]*/content/'], 936 ['exclude', '^[^/]*/content/'],
942 ], 937 ],
938 'mac_bundle_resources': [
939 '<(PRODUCT_DIR)/ui_test.pak',
940 ],
943 'dependencies': [ 941 'dependencies': [
944 '../ios/ios_tests.gyp:test_support_ios', 942 '../ios/ios_tests.gyp:test_support_ios',
945 '../ios/web/ios_web.gyp:test_support_ios_web', 943 '../ios/web/ios_web.gyp:test_support_ios_web',
946 '../third_party/ocmock/ocmock.gyp:ocmock', 944 '../third_party/ocmock/ocmock.gyp:ocmock',
947 'components.gyp:open_from_clipboard', 945 'components.gyp:open_from_clipboard',
948 'components.gyp:sessions_ios', 946 'components.gyp:sessions_ios',
949 'components.gyp:signin_ios_browser', 947 'components.gyp:signin_ios_browser',
950 'components.gyp:translate_ios_browser', 948 'components.gyp:translate_ios_browser',
951 'components.gyp:webp_transcode', 949 'components.gyp:webp_transcode',
952 ], 950 ],
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
1457 ], 1455 ],
1458 'variables': { 1456 'variables': {
1459 'test_suite_name': 'components_unittests', 1457 'test_suite_name': 'components_unittests',
1460 }, 1458 },
1461 'includes': [ '../build/apk_test.gypi' ], 1459 'includes': [ '../build/apk_test.gypi' ],
1462 }, 1460 },
1463 ], 1461 ],
1464 }], 1462 }],
1465 ], 1463 ],
1466 } 1464 }
OLDNEW
« no previous file with comments | « components/BUILD.gn ('k') | components/components_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698