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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/gritsettings/resource_ids

Issue 10388218: Allow for building content_shell from within WebKit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_worker.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gritsettings/resource_ids
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index ec1241ed28943b1ee4577196517ef738952480c9..37c1c9b2f6f946449ea18d541f5ddfbfd26772c7 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -136,9 +136,14 @@
"includes": [20000],
},
# This file is generated during the build.
+ # devtools_resources.grd can be in two different places depending on whether
+ # we are in a chromium checkout or a webkit-only checkout.
"<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": {
"includes": [20500],
},
+ "devtools_resources.grd": {
+ "includes": [20500],
+ },
# All standard and large theme resources should have the same IDs.
"chrome/app/theme/theme_resources_standard.grd": {
"includes": [21000],
« no previous file with comments | « content/content_worker.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698