summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-24 23:38:55 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-24 23:38:55 +0000
commit226558c339b10721fd3266048a8f0ecb65c13605 (patch)
tree9c8762ce83b120b554bc1deaae5de828f9a34889 /webkit/glue
parent5f129def8edfb24581d13eee26029192c5c6c75e (diff)
downloadchromium_src-226558c339b10721fd3266048a8f0ecb65c13605.zip
chromium_src-226558c339b10721fd3266048a8f0ecb65c13605.tar.gz
chromium_src-226558c339b10721fd3266048a8f0ecb65c13605.tar.bz2
Final step in converting all grit includes to have grit in the path.
Fixes some linux/mac issues that were pending and fix up the scons build to expect the file in the grit subdir. BUG=7537 Review URL: http://codereview.chromium.org/28035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webkit_resources.grd2
-rw-r--r--webkit/glue/webkit_strings.grd2
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index da3d833..2970b70 100644
--- a/webkit/glue/webkit_resources.grd
+++ b/webkit/glue/webkit_resources.grd
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1">
<outputs>
- <output filename="webkit_resources.h" type="rc_header">
+ <output filename="grit/webkit_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="webkit_resources.rc" type="rc_all" />
diff --git a/webkit/glue/webkit_strings.grd b/webkit/glue/webkit_strings.grd
index e483b69..33dc30c 100644
--- a/webkit/glue/webkit_strings.grd
+++ b/webkit/glue/webkit_strings.grd
@@ -42,7 +42,7 @@ below:
(http://wiki/Main/GritUsersGuide) for more details.
Note that all output references are relative to the output directory
which is specified at build time. -->
- <output filename="webkit_strings.h" type="rc_header">
+ <output filename="grit/webkit_strings.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="webkit_strings_ar.rc" type="rc_all" lang="ar" />