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

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: . 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
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 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 'components_resources.gyp:components_resources', 610 'components_resources.gyp:components_resources',
611 'components_strings.gyp:components_strings', 611 'components_strings.gyp:components_strings',
612 ], 612 ],
613 'actions': [ 613 'actions': [
614 { 614 {
615 'action_name': 'repack_components_tests_pak', 615 'action_name': 'repack_components_tests_pak',
616 'variables': { 616 'variables': {
617 'pak_inputs': [ 617 'pak_inputs': [
618 '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak', 618 '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak',
619 '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_ en-US.pak', 619 '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_ en-US.pak',
620 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak',
621 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
622 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.p ak',
623 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
624 ], 620 ],
625 'pak_output': '<(PRODUCT_DIR)/components_tests_resources.pak', 621 'pak_output': '<(PRODUCT_DIR)/components_tests_resources.pak',
626 }, 622 },
627 'includes': [ '../build/repack_action.gypi' ], 623 'includes': [ '../build/repack_action.gypi' ],
628 }, 624 },
629 ], 625 ],
630 'direct_dependent_settings': { 626 'direct_dependent_settings': {
631 'mac_bundle_resources': [ 627 'mac_bundle_resources': [
632 '<(PRODUCT_DIR)/components_tests_resources.pak', 628 '<(PRODUCT_DIR)/components_tests_resources.pak',
633 ], 629 ],
(...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
1436 ], 1432 ],
1437 'variables': { 1433 'variables': {
1438 'test_suite_name': 'components_unittests', 1434 'test_suite_name': 'components_unittests',
1439 }, 1435 },
1440 'includes': [ '../build/apk_test.gypi' ], 1436 'includes': [ '../build/apk_test.gypi' ],
1441 }, 1437 },
1442 ], 1438 ],
1443 }], 1439 }],
1444 ], 1440 ],
1445 } 1441 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698