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

Unified Diff: trunk/src/chrome/chrome_repack_resources.gypi

Issue 22557005: Revert 216822 "Remove chrome.pak references, build resources int..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/chrome/chrome_repack_chrome.gypi ('k') | trunk/src/chrome/chrome_resources.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/chrome_repack_resources.gypi
===================================================================
--- trunk/src/chrome/chrome_repack_resources.gypi (revision 216822)
+++ trunk/src/chrome/chrome_repack_resources.gypi (working copy)
@@ -5,26 +5,14 @@
'action_name': 'repack_resources',
'variables': {
'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
- '<(grit_out_dir)/browser_resources.pak',
- '<(grit_out_dir)/common_resources.pak',
'<(grit_out_dir)/memory_internals_resources.pak',
'<(grit_out_dir)/net_internals_resources.pak',
'<(grit_out_dir)/signin_internals_resources.pak',
'<(grit_out_dir)/sync_internals_resources.pak',
'<(grit_out_dir)/translate_internals_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
],
'conditions': [
- ['OS != "ios"', {
- 'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
- '<(grit_out_dir)/devtools_discovery_page_resources.pak',
- ],
- }],
['OS != "ios" and OS != "android"', {
# New paks should be added here by default.
'pak_inputs': [
@@ -35,9 +23,9 @@
'<(grit_out_dir)/sync_file_system_internals_resources.pak',
],
}],
- ['enable_extensions==1', {
+ ['OS != "ios"', {
'pak_inputs': [
- '<(grit_out_dir)/extensions_api_resources.pak',
+ '<(grit_out_dir)/devtools_discovery_page_resources.pak',
],
}],
],
« no previous file with comments | « trunk/src/chrome/chrome_repack_chrome.gypi ('k') | trunk/src/chrome/chrome_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698