diff options
author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 23:38:55 +0000 |
---|---|---|
committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 23:38:55 +0000 |
commit | 226558c339b10721fd3266048a8f0ecb65c13605 (patch) | |
tree | 9c8762ce83b120b554bc1deaae5de828f9a34889 /chrome/app | |
parent | 5f129def8edfb24581d13eee26029192c5c6c75e (diff) | |
download | chromium_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 'chrome/app')
-rw-r--r-- | chrome/app/chromium_strings.grd | 2 | ||||
-rw-r--r-- | chrome/app/generated_resources.grd | 2 | ||||
-rw-r--r-- | chrome/app/google_chrome_strings.grd | 2 | ||||
-rwxr-xr-x | chrome/app/resources/locale_settings.grd | 2 | ||||
-rw-r--r-- | chrome/app/theme/theme_resources.grd | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index aad04c6..07e4230 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -6,7 +6,7 @@ be available for now. --> <grit base_dir="." latest_public_release="0" current_release="1" source_lang_id="en" enc_check="möl"> <outputs> - <output filename="chromium_strings.h" type="rc_header"> + <output filename="grit/chromium_strings.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> <output filename="chromium_strings_ar.rc" type="rc_all" lang="ar" /> diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 463736a..96b4f9b 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6,7 +6,7 @@ each locale. --> <grit base_dir="." latest_public_release="0" current_release="1" source_lang_id="en" enc_check="möl"> <outputs> - <output filename="generated_resources.h" type="rc_header"> + <output filename="grit/generated_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> <output filename="generated_resources_ar.rc" type="rc_all" lang="ar" /> diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index 6d71ed7..747c303 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -6,7 +6,7 @@ Chrome supports. --> <grit base_dir="." latest_public_release="0" current_release="1" source_lang_id="en" enc_check="möl"> <outputs> - <output filename="google_chrome_strings.h" type="rc_header"> + <output filename="grit/google_chrome_strings.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> <output filename="google_chrome_strings_ar.rc" type="rc_all" lang="ar" /> diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd index 15735db..163bf39 100755 --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <grit latest_public_release="0" current_release="1"> <outputs> - <output filename="locale_settings.h" type="rc_header"> + <output filename="grit/locale_settings.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> <output filename="locale_settings_ar.rc" type="rc_all" lang="ar" /> diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index e2cf280..12d25d7 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <grit latest_public_release="0" current_release="1"> <outputs> - <output filename="theme_resources.h" type="rc_header"> + <output filename="grit/theme_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> <output filename="theme_resources.rc" type="rc_all" /> |