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

Side by Side Diff: chrome/chrome_repack_resources.gypi

Issue 22339020: Remove chrome.pak references, build resources into resources.pak (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove chrome.pak references so 'all' builds Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_repack_chrome.gypi ('k') | chrome/chrome_resources.gyp » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'action_name': 'repack_resources', 5 'action_name': 'repack_resources',
6 'variables': { 6 'variables': {
7 'pak_inputs': [ 7 'pak_inputs': [
8 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.pak',
9 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
10 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
11 '<(grit_out_dir)/browser_resources.pak',
12 '<(grit_out_dir)/common_resources.pak',
8 '<(grit_out_dir)/memory_internals_resources.pak', 13 '<(grit_out_dir)/memory_internals_resources.pak',
9 '<(grit_out_dir)/net_internals_resources.pak', 14 '<(grit_out_dir)/net_internals_resources.pak',
10 '<(grit_out_dir)/signin_internals_resources.pak', 15 '<(grit_out_dir)/signin_internals_resources.pak',
11 '<(grit_out_dir)/sync_internals_resources.pak', 16 '<(grit_out_dir)/sync_internals_resources.pak',
12 '<(grit_out_dir)/translate_internals_resources.pak', 17 '<(grit_out_dir)/translate_internals_resources.pak',
13 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
14 ], 18 ],
15 'conditions': [ 19 'conditions': [
20 ['OS != "ios"', {
21 'pak_inputs': [
22 '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources. pak',
23 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
24 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
25 '<(grit_out_dir)/devtools_discovery_page_resources.pak',
26 ],
27 }],
16 ['OS != "ios" and OS != "android"', { 28 ['OS != "ios" and OS != "android"', {
17 # New paks should be added here by default. 29 # New paks should be added here by default.
18 'pak_inputs': [ 30 'pak_inputs': [
19 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', 31 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
20 '<(grit_out_dir)/component_extension_resources.pak', 32 '<(grit_out_dir)/component_extension_resources.pak',
21 '<(grit_out_dir)/options_resources.pak', 33 '<(grit_out_dir)/options_resources.pak',
22 '<(grit_out_dir)/quota_internals_resources.pak', 34 '<(grit_out_dir)/quota_internals_resources.pak',
23 '<(grit_out_dir)/sync_file_system_internals_resources.pak', 35 '<(grit_out_dir)/sync_file_system_internals_resources.pak',
24 ], 36 ],
25 }], 37 }],
26 ['OS != "ios"', { 38 ['enable_extensions==1', {
27 'pak_inputs': [ 39 'pak_inputs': [
28 '<(grit_out_dir)/devtools_discovery_page_resources.pak', 40 '<(grit_out_dir)/extensions_api_resources.pak',
29 ], 41 ],
30 }], 42 }],
31 ], 43 ],
32 }, 44 },
33 'inputs': [ 45 'inputs': [
34 '<(repack_path)', 46 '<(repack_path)',
35 '<@(pak_inputs)', 47 '<@(pak_inputs)',
36 ], 48 ],
37 'outputs': [ 49 'outputs': [
38 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', 50 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
39 ], 51 ],
40 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'], 52 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
41 } 53 }
OLDNEW
« no previous file with comments | « chrome/chrome_repack_chrome.gypi ('k') | chrome/chrome_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698