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

Unified Diff: chrome/chrome.gyp

Issue 6685061: Compile the devtools grd file into a .pak file so we (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and fix win Created 9 years, 9 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 | « no previous file | tools/grit/grit/grd_reader.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 8d5869bf143c0fa933237f1e362046a7023c8746..be7def49f83c8ac5c6140dc1ceb605d3b2572a7f 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -422,6 +422,7 @@
},
'inputs': [
'<@(chrome_extra_resources_inputs)',
+ '<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd',
],
'outputs': [
'<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h',
@@ -441,6 +442,7 @@
'<(RULE_INPUT_PATH)',
'build', '-o', '<(grit_out_dir)',
'-D', '<(chrome_build)',
+ '-D', 'SHARED_INTERMEDIATE_DIR=<(SHARED_INTERMEDIATE_DIR)',
'-E', '<(branded_env)',
'<@(grit_defines)',
],
@@ -450,6 +452,10 @@
'sources': [
'<@(chrome_extra_resources_grds)',
'<@(chrome_extra_resources_inputs)',
+ '<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd',
+ ],
+ 'dependencies': [
+ '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:generate_devtools_grd',
],
'direct_dependent_settings': {
'include_dirs': [
« no previous file with comments | « no previous file | tools/grit/grit/grd_reader.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698