diff options
| author | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 05:41:00 +0000 |
|---|---|---|
| committer | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 05:41:00 +0000 |
| commit | 769c475d2ee42dfd4c84a5401da543eed91fb61a (patch) | |
| tree | 0adaa2078dabf8b3fd5deab8873daf7d794367a1 /chrome/app | |
| parent | caf19ffaa8d04d09ff3949d3683dc37cc3b41152 (diff) | |
| download | chromium_src-769c475d2ee42dfd4c84a5401da543eed91fb61a.zip chromium_src-769c475d2ee42dfd4c84a5401da543eed91fb61a.tar.gz chromium_src-769c475d2ee42dfd4c84a5401da543eed91fb61a.tar.bz2 | |
Convert to gyp generation of chrome_resources and chrome_strings.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/119061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_dll.vcproj | 8 | ||||
| -rw-r--r-- | chrome/app/locales/locales.gyp | 4 | ||||
| -rw-r--r-- | chrome/app/theme/theme_dll.vcproj | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/chrome/app/chrome_dll.vcproj b/chrome/app/chrome_dll.vcproj index a75157d..7e6c65f 100644 --- a/chrome/app/chrome_dll.vcproj +++ b/chrome/app/chrome_dll.vcproj @@ -170,7 +170,7 @@ > </File> <File - RelativePath="$(OutDir)\grit_derived_sources\browser_resources.rc" + RelativePath="$(OutDir)\obj\global_intermediate_dir\chrome\browser_resources.rc" > </File> <File @@ -202,7 +202,7 @@ > </File> <File - RelativePath="$(OutDir)\grit_derived_sources\common_resources.rc" + RelativePath="$(OutDir)\obj\global_intermediate_dir\chrome\common_resources.rc" > </File> <File @@ -210,7 +210,7 @@ > </File> <File - RelativePath="$(OutDir)\grit_derived_sources\debugger_resources.rc" + RelativePath="$(OutDir)\obj\global_intermediate_dir\chrome\debugger_resources.rc" > </File> <File @@ -218,7 +218,7 @@ > </File> <File - RelativePath="$(OutDir)\grit_derived_sources\renderer_resources.rc" + RelativePath="$(OutDir)\obj\global_intermediate_dir\chrome\renderer_resources.rc" > </File> <File diff --git a/chrome/app/locales/locales.gyp b/chrome/app/locales/locales.gyp index 8295030..c2f0ed7 100644 --- a/chrome/app/locales/locales.gyp +++ b/chrome/app/locales/locales.gyp @@ -1,9 +1,7 @@ { 'variables': { 'chromium_code': 1, - # Switch to with chrome.sln landing. - #'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', - 'chrome_grit_out_dir': '$(OutDir)/grit_derived_sources', + 'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', diff --git a/chrome/app/theme/theme_dll.vcproj b/chrome/app/theme/theme_dll.vcproj index a1c0c66..7f0078b 100644 --- a/chrome/app/theme/theme_dll.vcproj +++ b/chrome/app/theme/theme_dll.vcproj @@ -140,7 +140,7 @@ </References> <Files> <File - RelativePath="$(OutDir)\grit_derived_sources\theme_resources.rc" + RelativePath="$(OutDir)\obj\global_intermediate\chrome\theme_resources.rc" > </File> <File |