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

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: fix-gn 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 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 'components_resources.gyp:components_resources', 624 'components_resources.gyp:components_resources',
625 'components_strings.gyp:components_strings', 625 'components_strings.gyp:components_strings',
626 ], 626 ],
627 'actions': [ 627 'actions': [
628 { 628 {
629 'action_name': 'repack_components_tests_pak', 629 'action_name': 'repack_components_tests_pak',
630 'variables': { 630 'variables': {
631 'pak_inputs': [ 631 'pak_inputs': [
632 '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak', 632 '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak',
633 '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_ en-US.pak', 633 '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_ en-US.pak',
634 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak',
635 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
636 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.p ak',
637 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
638 ], 634 ],
639 'pak_output': '<(PRODUCT_DIR)/components_tests_resources.pak', 635 'pak_output': '<(PRODUCT_DIR)/components_tests_resources.pak',
640 }, 636 },
641 'includes': [ '../build/repack_action.gypi' ], 637 'includes': [ '../build/repack_action.gypi' ],
642 }, 638 },
643 ], 639 ],
644 'direct_dependent_settings': { 640 'direct_dependent_settings': {
645 'mac_bundle_resources': [ 641 'mac_bundle_resources': [
646 '<(PRODUCT_DIR)/components_tests_resources.pak', 642 '<(PRODUCT_DIR)/components_tests_resources.pak',
647 ], 643 ],
(...skipping 808 matching lines...) Expand 10 before | Expand all | Expand 10 after
1456 ], 1452 ],
1457 'variables': { 1453 'variables': {
1458 'test_suite_name': 'components_unittests', 1454 'test_suite_name': 'components_unittests',
1459 }, 1455 },
1460 'includes': [ '../build/apk_test.gypi' ], 1456 'includes': [ '../build/apk_test.gypi' ],
1461 }, 1457 },
1462 ], 1458 ],
1463 }], 1459 }],
1464 ], 1460 ],
1465 } 1461 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698