Have GRIT generate files into a common directory.

Joi has convinced me that GRIT should generate platform specific
resources files.  This is easier than parsing .rc files because
GRIT effectively has an .rc parser.  To that end, we need to
convert some existing .rc files to .grd files (e.g., net_resources.rc
and webkit_resources.rc).  Rather than having every grd file output
to a different place and -I all the different paths, have GRIT
generate all files into one directory.  This directory is
grit_derived_sources.

Review URL: http://codereview.chromium.org/13776

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6940 0039d316-1c4b-4281-b951-d872f2087c98

70 files changed, 199 insertions, 187 deletions

diff --git a/chrome/SConscript b/chrome/SConscript
index 92d8c33..4942449 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -206,18 +206,21 @@ env_grd = env.Clone()
 env_grd.Tool('scons', toolpath=[env_grd.Dir('$CHROME_SRC_DIR/tools/grit/grit')])
 
 # NOTE: fake target gets replaced with real targets from reading .grd
-generated = env_grd.GRIT('app/resources/fake_generated_target',
-                         '$CHROME_SRC_DIR/chrome/app/generated_resources.grd')
+generated = env_grd.GRIT(
+    '$TARGET_ROOT/grit_derived_sources/fake_generated_target',
+    '$CHROME_SRC_DIR/chrome/app/generated_resources.grd')
 grit_files.extend(generated)
 
 # NOTE: fake target gets replaced with real targets from reading .grd
-chromium = env_grd.GRIT('app/resources/fake_chromium_target',
-                         '$CHROME_SRC_DIR/chrome/app/chromium_strings.grd')
+chromium = env_grd.GRIT(
+    '$TARGET_ROOT/grit_derived_sources/fake_chromium_target',
+    '$CHROME_SRC_DIR/chrome/app/chromium_strings.grd')
 grit_files.extend(chromium)
 
 # NOTE: fake target gets replaced with real targets from reading .grd
-google_chrome = env_grd.GRIT('app/resources/fake_google_chrome_target',
-                         '$CHROME_SRC_DIR/chrome/app/google_chrome_strings.grd')
+google_chrome = env_grd.GRIT(
+    '$TARGET_ROOT/grit_derived_sources/fake_google_chrome_target',
+    '$CHROME_SRC_DIR/chrome/app/google_chrome_strings.grd')
 grit_files.extend(google_chrome)
 
 
@@ -351,7 +354,9 @@ env_flat['BUILDERS']['FlatHtml'] = Builder(action='$FLATTEN_HTML_COM',
 flats = [
     'browser/resources/about_credits.html',
     'browser/resources/about_memory.html',
+    'browser/resources/about_stats.html',
     'browser/resources/about_version.html',
+    'browser/resources/history.html',
     'browser/resources/incognito_tab.html',
     'browser/resources/new_tab.html',
     'browser/resources/safe_browsing_malware_block.html',
diff --git a/chrome/app/locales/ar.vcproj b/chrome/app/locales/ar.vcproj
index eddde15..46e33d4 100644
--- a/chrome/app/locales/ar.vcproj
+++ b/chrome/app/locales/ar.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_ar.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_ar.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_ar.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ar.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/bg.vcproj b/chrome/app/locales/bg.vcproj
index fa92073..91e0265 100644
--- a/chrome/app/locales/bg.vcproj
+++ b/chrome/app/locales/bg.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_bg.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_bg.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_bg.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_bg.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/bn.vcproj b/chrome/app/locales/bn.vcproj
index b93b7e0..4828c8d 100644
--- a/chrome/app/locales/bn.vcproj
+++ b/chrome/app/locales/bn.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_bn.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_bn.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_bn.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_bn.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/ca.vcproj b/chrome/app/locales/ca.vcproj
index f6b6147..b6c59a7 100644
--- a/chrome/app/locales/ca.vcproj
+++ b/chrome/app/locales/ca.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_ca.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_ca.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_ca.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ca.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/cs.vcproj b/chrome/app/locales/cs.vcproj
index bffe409..5d24481 100644
--- a/chrome/app/locales/cs.vcproj
+++ b/chrome/app/locales/cs.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_cs.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_cs.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_cs.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_cs.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/da.vcproj b/chrome/app/locales/da.vcproj
index d5f4170..6705516 100644
--- a/chrome/app/locales/da.vcproj
+++ b/chrome/app/locales/da.vcproj
@@ -140,11 +140,11 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_da.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_da.rc"

 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_da.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_da.rc"

 			>

 		</File>

 		<File

diff --git a/chrome/app/locales/de.vcproj b/chrome/app/locales/de.vcproj
index aa9a430..bd151c5 100644
--- a/chrome/app/locales/de.vcproj
+++ b/chrome/app/locales/de.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_de.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_de.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_de.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_de.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/el.vcproj b/chrome/app/locales/el.vcproj
index a16f8cd..78e6164 100644
--- a/chrome/app/locales/el.vcproj
+++ b/chrome/app/locales/el.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_el.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_el.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_el.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_el.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/en-GB.vcproj b/chrome/app/locales/en-GB.vcproj
index b717b78..ff718a4 100644
--- a/chrome/app/locales/en-GB.vcproj
+++ b/chrome/app/locales/en-GB.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_en-GB.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_en-GB.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_en-GB.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_en-GB.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/en-US.vcproj b/chrome/app/locales/en-US.vcproj
index b297c98..e200b95 100644
--- a/chrome/app/locales/en-US.vcproj
+++ b/chrome/app/locales/en-US.vcproj
@@ -142,11 +142,11 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_en-US.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_en-US.rc"

 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_en-US.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_en-US.rc"

 			>

 		</File>

 		<File

diff --git a/chrome/app/locales/es-419.vcproj b/chrome/app/locales/es-419.vcproj
index 1841eb9..9df99a8 100644
--- a/chrome/app/locales/es-419.vcproj
+++ b/chrome/app/locales/es-419.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_es-419.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_es-419.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_es-419.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_es-419.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/es.vcproj b/chrome/app/locales/es.vcproj
index 1be7ccf..1609cab 100644
--- a/chrome/app/locales/es.vcproj
+++ b/chrome/app/locales/es.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_es.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_es.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_es.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_es.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/et.vcproj b/chrome/app/locales/et.vcproj
index 888cd0a..3284b30 100644
--- a/chrome/app/locales/et.vcproj
+++ b/chrome/app/locales/et.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_et.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_et.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_et.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_et.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/fi.vcproj b/chrome/app/locales/fi.vcproj
index 6a04cc7..756e181 100644
--- a/chrome/app/locales/fi.vcproj
+++ b/chrome/app/locales/fi.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_fi.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_fi.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_fi.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_fi.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/fil.vcproj b/chrome/app/locales/fil.vcproj
index b8cb1eb..efa6421 100644
--- a/chrome/app/locales/fil.vcproj
+++ b/chrome/app/locales/fil.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_fil.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_fil.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_fil.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_fil.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/fr.vcproj b/chrome/app/locales/fr.vcproj
index 9570d7d..d01ac02 100644
--- a/chrome/app/locales/fr.vcproj
+++ b/chrome/app/locales/fr.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_fr.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_fr.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_fr.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_fr.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/gu.vcproj b/chrome/app/locales/gu.vcproj
index eebaf02..94670fd 100644
--- a/chrome/app/locales/gu.vcproj
+++ b/chrome/app/locales/gu.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_gu.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_gu.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_gu.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_gu.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/he.vcproj b/chrome/app/locales/he.vcproj
index eaaf1f4..6c761b2 100644
--- a/chrome/app/locales/he.vcproj
+++ b/chrome/app/locales/he.vcproj
@@ -140,11 +140,11 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_he.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_he.rc"

 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_he.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_he.rc"

 			>

 		</File>

 		<File

diff --git a/chrome/app/locales/hi.vcproj b/chrome/app/locales/hi.vcproj
index 8934487..1cd21fb 100644
--- a/chrome/app/locales/hi.vcproj
+++ b/chrome/app/locales/hi.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_hi.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_hi.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_hi.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_hi.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/hr.vcproj b/chrome/app/locales/hr.vcproj
index 1f2dc4b..8a95080 100644
--- a/chrome/app/locales/hr.vcproj
+++ b/chrome/app/locales/hr.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_hr.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_hr.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_hr.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_hr.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/hu.vcproj b/chrome/app/locales/hu.vcproj
index c9cdc2d..6e93959 100644
--- a/chrome/app/locales/hu.vcproj
+++ b/chrome/app/locales/hu.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_hu.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_hu.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_hu.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_hu.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/id.vcproj b/chrome/app/locales/id.vcproj
index 911c9db..62fde9f 100644
--- a/chrome/app/locales/id.vcproj
+++ b/chrome/app/locales/id.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_id.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_id.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_id.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_id.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/it.vcproj b/chrome/app/locales/it.vcproj
index 6d3cd5e..818e37f 100644
--- a/chrome/app/locales/it.vcproj
+++ b/chrome/app/locales/it.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_it.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_it.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_it.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_it.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/ja.vcproj b/chrome/app/locales/ja.vcproj
index 4114117..9c1c294 100644
--- a/chrome/app/locales/ja.vcproj
+++ b/chrome/app/locales/ja.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_ja.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_ja.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_ja.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ja.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/kn.vcproj b/chrome/app/locales/kn.vcproj
index 28b6b70..c2b8caf 100644
--- a/chrome/app/locales/kn.vcproj
+++ b/chrome/app/locales/kn.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_kn.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_kn.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_kn.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_kn.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/ko.vcproj b/chrome/app/locales/ko.vcproj
index 4aedbeb..03094f5 100644
--- a/chrome/app/locales/ko.vcproj
+++ b/chrome/app/locales/ko.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_ko.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_ko.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_ko.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ko.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/lt.vcproj b/chrome/app/locales/lt.vcproj
index 09046ed..9aa39a4 100644
--- a/chrome/app/locales/lt.vcproj
+++ b/chrome/app/locales/lt.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_lt.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_lt.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_lt.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_lt.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/lv.vcproj b/chrome/app/locales/lv.vcproj
index 92d1bfd..4fd328d2 100644
--- a/chrome/app/locales/lv.vcproj
+++ b/chrome/app/locales/lv.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_lv.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_lv.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_lv.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_lv.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/ml.vcproj b/chrome/app/locales/ml.vcproj
index 13e717ad..77caf57 100644
--- a/chrome/app/locales/ml.vcproj
+++ b/chrome/app/locales/ml.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_ml.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_ml.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_ml.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ml.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/mr.vcproj b/chrome/app/locales/mr.vcproj
index 3b2d2b9..97b5312 100644
--- a/chrome/app/locales/mr.vcproj
+++ b/chrome/app/locales/mr.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_mr.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_mr.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_mr.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_mr.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/nb.vcproj b/chrome/app/locales/nb.vcproj
index 922a9f2..00c8fe8 100644
--- a/chrome/app/locales/nb.vcproj
+++ b/chrome/app/locales/nb.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_nb.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_nb.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_nb.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_nb.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/nl.vcproj b/chrome/app/locales/nl.vcproj
index eded6b7..6038838 100644
--- a/chrome/app/locales/nl.vcproj
+++ b/chrome/app/locales/nl.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_nl.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_nl.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_nl.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_nl.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/or.vcproj b/chrome/app/locales/or.vcproj
index bf65a0b..cba063a 100644
--- a/chrome/app/locales/or.vcproj
+++ b/chrome/app/locales/or.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_or.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_or.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_or.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_or.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/pl.vcproj b/chrome/app/locales/pl.vcproj
index e9e32f5..f91e7a9 100644
--- a/chrome/app/locales/pl.vcproj
+++ b/chrome/app/locales/pl.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_pl.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_pl.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_pl.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_pl.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/pt-BR.vcproj b/chrome/app/locales/pt-BR.vcproj
index 57b8f6c..fdae5ff 100644
--- a/chrome/app/locales/pt-BR.vcproj
+++ b/chrome/app/locales/pt-BR.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_pt-BR.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_pt-BR.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_pt-BR.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_pt-BR.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/pt-PT.vcproj b/chrome/app/locales/pt-PT.vcproj
index 74153bc..2bc7e10 100644
--- a/chrome/app/locales/pt-PT.vcproj
+++ b/chrome/app/locales/pt-PT.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_pt-PT.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_pt-PT.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_pt-PT.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_pt-PT.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/ro.vcproj b/chrome/app/locales/ro.vcproj
index f1f2b84..0eb6835 100644
--- a/chrome/app/locales/ro.vcproj
+++ b/chrome/app/locales/ro.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_ro.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_ro.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_ro.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ro.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/ru.vcproj b/chrome/app/locales/ru.vcproj
index 8e43029..1c73e98 100644
--- a/chrome/app/locales/ru.vcproj
+++ b/chrome/app/locales/ru.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_ru.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_ru.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_ru.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ru.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/sk.vcproj b/chrome/app/locales/sk.vcproj
index b79b8d7..1b3c8f7 100644
--- a/chrome/app/locales/sk.vcproj
+++ b/chrome/app/locales/sk.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_sk.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_sk.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_sk.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sk.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/sl.vcproj b/chrome/app/locales/sl.vcproj
index 976c28d..b5d9d82 100644
--- a/chrome/app/locales/sl.vcproj
+++ b/chrome/app/locales/sl.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_sl.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_sl.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_sl.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sl.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/sr.vcproj b/chrome/app/locales/sr.vcproj
index 40e5131..6eb25bf 100644
--- a/chrome/app/locales/sr.vcproj
+++ b/chrome/app/locales/sr.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_sr.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_sr.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_sr.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sr.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/sv.vcproj b/chrome/app/locales/sv.vcproj
index e5675a0..5871462 100644
--- a/chrome/app/locales/sv.vcproj
+++ b/chrome/app/locales/sv.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_sv.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_sv.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_sv.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sv.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/ta.vcproj b/chrome/app/locales/ta.vcproj
index 670e310..8c5049e 100644
--- a/chrome/app/locales/ta.vcproj
+++ b/chrome/app/locales/ta.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_ta.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_ta.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_ta.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ta.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/te.vcproj b/chrome/app/locales/te.vcproj
index 875b836..a57090d 100644
--- a/chrome/app/locales/te.vcproj
+++ b/chrome/app/locales/te.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_te.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_te.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_te.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_te.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/th.vcproj b/chrome/app/locales/th.vcproj
index 40a7531..f3b2ea5 100644
--- a/chrome/app/locales/th.vcproj
+++ b/chrome/app/locales/th.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_th.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_th.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_th.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_th.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/tr.vcproj b/chrome/app/locales/tr.vcproj
index f5eaee2..0cfe3c3 100644
--- a/chrome/app/locales/tr.vcproj
+++ b/chrome/app/locales/tr.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_tr.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_tr.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_tr.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_tr.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/uk.vcproj b/chrome/app/locales/uk.vcproj
index 9413b84..895a34e 100644
--- a/chrome/app/locales/uk.vcproj
+++ b/chrome/app/locales/uk.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_uk.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_uk.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_uk.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_uk.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/vi.vcproj b/chrome/app/locales/vi.vcproj
index 3d7b31b..2e4d220 100644
--- a/chrome/app/locales/vi.vcproj
+++ b/chrome/app/locales/vi.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_vi.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_vi.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_vi.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_vi.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/zh-CN.vcproj b/chrome/app/locales/zh-CN.vcproj
index 4bf3dda..bac1e33 100644
--- a/chrome/app/locales/zh-CN.vcproj
+++ b/chrome/app/locales/zh-CN.vcproj
@@ -140,7 +140,7 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_zh-CN.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_zh-CN.rc"

 			>

 		</File>

 		<File

@@ -148,7 +148,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_zh-CN.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_zh-CN.rc"

 			>

 		</File>

 	</Files>

diff --git a/chrome/app/locales/zh-TW.vcproj b/chrome/app/locales/zh-TW.vcproj
index fc0877e..36c6433 100644
--- a/chrome/app/locales/zh-TW.vcproj
+++ b/chrome/app/locales/zh-TW.vcproj
@@ -140,11 +140,11 @@
 	</References>

 	<Files>

 		<File

-			RelativePath="$(IntDir)\..\generated_resources\generated_resources_zh-TW.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\generated_resources_zh-TW.rc"

 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\..\localized_strings\webkit_strings_zh-TW.rc"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_zh-TW.rc"

 			>

 		</File>

 		<File

diff --git a/chrome/app/resources/SConscript b/chrome/app/resources/SConscript
index 5b63c7f..69a14c0 100644
--- a/chrome/app/resources/SConscript
+++ b/chrome/app/resources/SConscript
@@ -15,6 +15,7 @@ env_res.Append(
     ],
     RCFLAGS = [
         ['/l', '0x409'],
+        ['/I', '$TARGET_ROOT/grit_derived_sources'],
     ],
 )
 
@@ -77,7 +78,10 @@ for rc in rc_files:
   res = env_res.RES(rc)
   resources.extend(res)
   # TODO(sgk):  find out why this implicit dependency isn't discovered
-  env.Depends(res, rc.replace('locale_settings', 'google_chrome_strings'))
+  env.Depends(res, rc.replace('locale_settings',
+      '$TARGET_ROOT/grit_derived_sources/google_chrome_strings'))
+  env.Depends(res, rc.replace('locale_settings',
+      '$TARGET_ROOT/grit_derived_sources/chromium_strings'))
 
 
 env.Append(
@@ -113,9 +117,11 @@ for locale_settings_res in resources:
   s = str(locale_settings_res)
   #lang = '$CHROME_DIR/locales/' + extract_lang.match(s).group(1)
   lang = extract_lang.match(s).group(1)
-  g_r_res = s.replace('locale_settings', 'generated_resources')
+  g_r_res = s.replace('locale_settings',
+                      '$TARGET_ROOT/grit_derived_sources/generated_resources')
   w_s_res = s.replace('locale_settings',
-                      '$WEBKIT_DIR/build/localized_strings/webkit_strings')
+                      '$TARGET_ROOT/grit_derived_sources/webkit_strings')
+
   dll = env_lang.ChromeSharedLibrary(
       lang,
       [
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 3ac082e..010ebd0 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -19,16 +19,9 @@ env.SConscript([
     '$ZLIB_DIR/using_zlib.scons',
 ], {'env':env})
 
-# TODO(sgk):  convert into a using_*.scons pattern when we update WebKit.
-env.Append(
-    CPPPATH = [
-        '$WEBKIT_DIR/build/localized_strings',
-    ],
-)
-
 env.Prepend(
     CPPPATH = [
-        '$CHROME_DIR/app/resources',
+        '$TARGET_ROOT/grit_derived_sources',
         '$CHROME_DIR/app',
         '$CHROME_SRC_DIR',
         # To get the #include of history_indexer.h,
diff --git a/chrome/browser/debugger/debugger.scons b/chrome/browser/debugger/debugger.scons
index 11b23b6..57d5a3d 100644
--- a/chrome/browser/debugger/debugger.scons
+++ b/chrome/browser/debugger/debugger.scons
@@ -19,7 +19,7 @@ env.SConscript([
 
 env.Prepend(
     CPPPATH = [
-        '$CHROME_DIR/app/resources',
+        '$TARGET_ROOT/grit_derived_sources',
         '$CHROME_DIR/app',
         '$CHROME_SRC_DIR',
     ],
diff --git a/chrome/browser/views/SConscript b/chrome/browser/views/SConscript
index f7fe300..a0dcb2d 100644
--- a/chrome/browser/views/SConscript
+++ b/chrome/browser/views/SConscript
@@ -9,7 +9,7 @@ env = env.Clone()
 
 env.Prepend(
     CPPPATH = [
-        '$CHROME_DIR/app/resources',
+        '$TARGET_ROOT/grit_derived_sources',
         #'$OBJ_ROOT/google_update',
         '$OBJ_ROOT/chrome/tools/build/win',
         '$CHROME_SRC_DIR',
diff --git a/chrome/common/common.scons b/chrome/common/common.scons
index f514fa0..c7fc7f6 100644
--- a/chrome/common/common.scons
+++ b/chrome/common/common.scons
@@ -20,7 +20,7 @@ env.SConscript([
 
 env.Prepend(
     CPPPATH = [
-        '$CHROME_DIR/app/resources',
+        '$TARGET_ROOT/grit_derived_sources',
         '$CHROME_DIR/app',
         '$CHROME_SRC_DIR',
     ],
diff --git a/chrome/renderer/renderer.scons b/chrome/renderer/renderer.scons
index ab2a53c..d52b743 100644
--- a/chrome/renderer/renderer.scons
+++ b/chrome/renderer/renderer.scons
@@ -15,7 +15,7 @@ env.SConscript([
 
 env.Prepend(
     CPPPATH = [
-        '$CHROME_DIR/app/resources',
+        '$TARGET_ROOT/grit_derived_sources',
         '$CHROME_SRC_DIR',
     ],
 )
diff --git a/chrome/tools/build/win/language_dll.vsprops b/chrome/tools/build/win/language_dll.vsprops
index 9c28d1f..69dfbcc 100644
--- a/chrome/tools/build/win/language_dll.vsprops
+++ b/chrome/tools/build/win/language_dll.vsprops
@@ -11,6 +11,6 @@
 	/>
 	<Tool
 		Name="VCResourceCompilerTool"
-		AdditionalIncludeDirectories="$(IntDir)\..\generated_resources\"
+		AdditionalIncludeDirectories="$(OutDir)\grit_derived_sources"
 	/>
 </VisualStudioPropertySheet>
diff --git a/chrome/tools/build/win/using_generated_strings.vsprops b/chrome/tools/build/win/using_generated_strings.vsprops
index da11cb0..a92594bcd 100644
--- a/chrome/tools/build/win/using_generated_strings.vsprops
+++ b/chrome/tools/build/win/using_generated_strings.vsprops
@@ -6,6 +6,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(OutDir)\obj\generated_resources&quot;;&quot;$(OutDir)\obj\localized_strings&quot;"
+		AdditionalIncludeDirectories="&quot;$(OutDir)\grit_derived_sources&quot;"
 	/>
 </VisualStudioPropertySheet>
diff --git a/chrome/views/SConscript b/chrome/views/SConscript
index 78138bf..5512c6b 100644
--- a/chrome/views/SConscript
+++ b/chrome/views/SConscript
@@ -20,7 +20,7 @@ env.Prepend(
 
 env.Append(
     CPPPATH = [
-        '$CHROME_DIR/app/resources',
+        '$TARGET_ROOT/grit_derived_sources',
         '$ICU38_DIR/public/common',
         '$ICU38_DIR/public/i18n',
         '$SKIA_DIR/include',
diff --git a/tools/grit/build/grit_resource_file.bat b/tools/grit/build/grit_resource_file.bat
index 7853212..9769bef 100644
--- a/tools/grit/build/grit_resource_file.bat
+++ b/tools/grit/build/grit_resource_file.bat
@@ -7,9 +7,13 @@ setlocal
 
 set InFile=%~1
 set SolutionDir=%~2
-set InputDir=%~3
+set OutDir=%~3
+
+IF NOT EXIST %OutDir% (
+mkdir %OutDir%
+)
 
 :: Put cygwin in the path
 call %SolutionDir%\..\third_party\cygwin\setup_env.bat
 
-%SolutionDir%\..\third_party\python_24\python.exe %SolutionDir%\..\tools\grit\grit.py -i %InFile% build -o %InputDir%
+%SolutionDir%\..\third_party\python_24\python.exe %SolutionDir%\..\tools\grit\grit.py -i %InFile% build -o %OutDir%
diff --git a/tools/grit/build/grit_resource_file.rules b/tools/grit/build/grit_resource_file.rules
index d180c35..2f9e7f9 100644
--- a/tools/grit/build/grit_resource_file.rules
+++ b/tools/grit/build/grit_resource_file.rules
@@ -7,58 +7,58 @@
 		<CustomBuildRule
 			Name="GRIT Generated Resources"
 			DisplayName="GRIT Generated Resources"
-			CommandLine="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat [inputs] &quot;$(SolutionDir)&quot; &quot;$(IntDir)&quot;"
-			Outputs="$(IntDir)\$(InputName).h;
-			  $(IntDir)\$(InputName)_ar.rc;
-			  $(IntDir)\$(InputName)_bg.rc;
-			  $(IntDir)\$(InputName)_bn.rc;
-			  $(IntDir)\$(InputName)_ca.rc;
-			  $(IntDir)\$(InputName)_cs.rc;
-			  $(IntDir)\$(InputName)_da.rc;
-			  $(IntDir)\$(InputName)_de.rc;
-			  $(IntDir)\$(InputName)_el.rc;
-			  $(IntDir)\$(InputName)_en-GB.rc;
-			  $(IntDir)\$(InputName)_en-US.rc;
-			  $(IntDir)\$(InputName)_es.rc;
-			  $(IntDir)\$(InputName)_es-419.rc;
-			  $(IntDir)\$(InputName)_et.rc;
-			  $(IntDir)\$(InputName)_fi.rc;
-			  $(IntDir)\$(InputName)_fil.rc;
-			  $(IntDir)\$(InputName)_fr.rc;
-			  $(IntDir)\$(InputName)_gu.rc;
-			  $(IntDir)\$(InputName)_he.rc;
-			  $(IntDir)\$(InputName)_hi.rc;
-			  $(IntDir)\$(InputName)_hr.rc;
-			  $(IntDir)\$(InputName)_hu.rc;
-			  $(IntDir)\$(InputName)_id.rc;
-			  $(IntDir)\$(InputName)_it.rc;
-			  $(IntDir)\$(InputName)_ja.rc;
-			  $(IntDir)\$(InputName)_kn.rc;
-			  $(IntDir)\$(InputName)_ko.rc;
-			  $(IntDir)\$(InputName)_lt.rc;
-			  $(IntDir)\$(InputName)_lv.rc;
-			  $(IntDir)\$(InputName)_ml.rc;
-			  $(IntDir)\$(InputName)_mr.rc;
-			  $(IntDir)\$(InputName)_nl.rc;
-			  $(IntDir)\$(InputName)_nb.rc;
-			  $(IntDir)\$(InputName)_or.rc;
-			  $(IntDir)\$(InputName)_pl.rc;
-			  $(IntDir)\$(InputName)_pt-BR.rc;
-			  $(IntDir)\$(InputName)_pt-PT.rc;
-			  $(IntDir)\$(InputName)_ro.rc;
-			  $(IntDir)\$(InputName)_ru.rc;
-			  $(IntDir)\$(InputName)_sk.rc;
-			  $(IntDir)\$(InputName)_sl.rc;
-			  $(IntDir)\$(InputName)_sr.rc;
-			  $(IntDir)\$(InputName)_sv.rc;
-			  $(IntDir)\$(InputName)_ta.rc;
-			  $(IntDir)\$(InputName)_te.rc;
-			  $(IntDir)\$(InputName)_th.rc;
-			  $(IntDir)\$(InputName)_tr.rc;
-			  $(IntDir)\$(InputName)_uk.rc;
-			  $(IntDir)\$(InputName)_vi.rc;
-			  $(IntDir)\$(InputName)_zh-CN.rc;
-			  $(IntDir)\$(InputName)_zh-TW.rc;"
+			CommandLine="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat [inputs] &quot;$(SolutionDir)&quot; &quot;$(OutDir)\grit_derived_sources&quot;"
+			Outputs="$(OutDir)\grit_derived_sources\$(InputName).h;
+			  $(OutDir)\grit_derived_sources\$(InputName)_ar.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_bg.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_bn.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_ca.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_cs.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_da.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_de.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_el.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_en-GB.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_en-US.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_es.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_es-419.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_et.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_fi.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_fil.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_fr.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_gu.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_he.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_hi.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_hr.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_hu.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_id.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_it.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_ja.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_kn.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_ko.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_lt.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_lv.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_ml.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_mr.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_nl.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_nb.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_or.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_pl.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_pt-BR.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_pt-PT.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_ro.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_ru.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_sk.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_sl.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_sr.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_sv.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_ta.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_te.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_th.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_tr.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_uk.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_vi.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_zh-CN.rc;
+			  $(OutDir)\grit_derived_sources\$(InputName)_zh-TW.rc;"
 			AdditionalDependencies="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat;$(SolutionDir)..\tools\grit\grit.py;
 			  resources\$(InputName)_ar.xtb;
 			  resources\$(InputName)_bg.xtb;
diff --git a/webkit/SConscript b/webkit/SConscript
index aca174f..e748b1a 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -74,7 +74,10 @@ env.Append(
 
 env.Prepend(
     CPPPATH = [env.subst(x) for x in [
-        '$WEBKIT_DIR/build/localized_strings',
+
+        # We put our grit generated headers in a common place.  This matches
+        # what we do in Visual Studios.
+        '$TARGET_ROOT/grit_derived_sources',
         '$WEBKIT_DIR/build/JSConfig/WebCore',
 
         # TODO(sgk):  This directory was at this point in the /I list
diff --git a/webkit/build/glue/glue.vsprops b/webkit/build/glue/glue.vsprops
index 54cd1aa..29633cf 100644
--- a/webkit/build/glue/glue.vsprops
+++ b/webkit/build/glue/glue.vsprops
@@ -7,7 +7,7 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\glue;&quot;$(OutDir)&quot;;&quot;$(IntDir)\..\localized_strings&quot;;&quot;$(IntDir)\..\generated_resources&quot;"
+		AdditionalIncludeDirectories="..\..\glue;&quot;$(OutDir)&quot;;&quot;$(OutDir)\grit_derived_sources&quot;;"
 		PreprocessorDefinitions="_SCL_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=1"
 		WarnAsError="true"
 	/>
diff --git a/webkit/build/localized_strings/SConscript b/webkit/build/localized_strings/SConscript
index d964e49..5d7cef2 100644
--- a/webkit/build/localized_strings/SConscript
+++ b/webkit/build/localized_strings/SConscript
@@ -30,8 +30,9 @@ env_grd = env.Clone()
 env_grd.Tool('scons', toolpath=[env_grd.Dir('$CHROME_SRC_DIR/tools/grit/grit')])
 # This dummy target (webkit_strings) is used to tell the emitter where
 # to put the target files.
-generated = env_grd.GRIT('webkit_strings',
-                         '$CHROME_SRC_DIR/webkit/glue/webkit_strings.grd')
+generated = env_grd.GRIT(
+    '$TARGET_ROOT/grit_derived_sources/fake_generated_target',
+    '$CHROME_SRC_DIR/webkit/glue/webkit_strings.grd')
 
 if env_res['PLATFORM'] == 'win32':
   for g in [g for g in generated if str(g).endswith('.rc')]:
diff --git a/webkit/build/localized_strings/localized_strings.vcproj b/webkit/build/localized_strings/localized_strings.vcproj
index a833027..bef1a48 100644
--- a/webkit/build/localized_strings/localized_strings.vcproj
+++ b/webkit/build/localized_strings/localized_strings.vcproj
@@ -69,7 +69,7 @@
 			>

 		</File>

 		<File

-			RelativePath="$(IntDir)\webkit_strings.h"

+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings.h"

 			>

 		</File>

 	</Files>

diff --git a/webkit/default_plugin/default_plugin.vsprops b/webkit/default_plugin/default_plugin.vsprops
index db8a4cd..cb111c8 100644
--- a/webkit/default_plugin/default_plugin.vsprops
+++ b/webkit/default_plugin/default_plugin.vsprops
@@ -7,6 +7,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="$(IntDir)\..\localized_strings"
+		AdditionalIncludeDirectories="$(OutDir)\grit_derived_sources"
 	/>
 </VisualStudioPropertySheet>
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index 193a7b7..7715207 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -138,7 +138,7 @@ if env['PLATFORM'] == 'win32':
   resources = [
       env_res.RES('resources/test_shell.rc'),
       '$NET_DIR/net_resources.res',
-      '$WEBKIT_DIR/build/localized_strings/webkit_strings_en-US.res',
+      '$TARGET_ROOT/grit_derived_sources/webkit_strings_en-US.res',
   ]
 
   exe_input_files += [
diff --git a/webkit/tools/test_shell/test_shell.vcproj b/webkit/tools/test_shell/test_shell.vcproj
index b043e3d..e9170cf 100644
--- a/webkit/tools/test_shell/test_shell.vcproj
+++ b/webkit/tools/test_shell/test_shell.vcproj
@@ -205,7 +205,7 @@
 				>

 			</File>

 			<File

-				RelativePath="$(IntDir)\..\localized_strings\webkit_strings_en-US.rc"

+				RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_en-US.rc"

 				>

 			</File>

 		</Filter>

diff --git a/webkit/tools/test_shell/test_shell.vsprops b/webkit/tools/test_shell/test_shell.vsprops
index bbdbab4..442c4f4 100644
--- a/webkit/tools/test_shell/test_shell.vsprops
+++ b/webkit/tools/test_shell/test_shell.vsprops
@@ -7,7 +7,7 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(OutDir)\WebKit&quot;;&quot;$(SolutionDir)&quot;;&quot;$(IntDir)\..\localized_strings&quot;;&quot;$(SolutionDir)webkit\port\bridge&quot;;&quot;$(SolutionDir)webkit\port\platform&quot;;&quot;$(SolutionDir)webkit\port\platform\network&quot;;&quot;$(SolutionDir)webkit\glue&quot;;&quot;$(SolutionDir)third_party\webkit\src\&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)&quot;"
+		AdditionalIncludeDirectories="&quot;$(OutDir)\WebKit&quot;;&quot;$(SolutionDir)&quot;;&quot;$(OutDir)\grit_derived_sources&quot;;&quot;$(SolutionDir)webkit\port\bridge&quot;;&quot;$(SolutionDir)webkit\port\platform&quot;;&quot;$(SolutionDir)webkit\port\platform\network&quot;;&quot;$(SolutionDir)webkit\glue&quot;;&quot;$(SolutionDir)third_party\webkit\src\&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)&quot;"
 		PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
 	/>
 	<Tool