diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 07:26:33 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 07:26:33 +0000 |
| commit | 413d988c3572180c145f0317791031b62e7eee52 (patch) | |
| tree | 65f7c24d206aeb25687a60cbb1f0e70bfb064037 /chrome/SConscript | |
| parent | 64fd34a9ee1f5e36c0deb1d5006407a065f7dd13 (diff) | |
| download | chromium_src-413d988c3572180c145f0317791031b62e7eee52.zip chromium_src-413d988c3572180c145f0317791031b62e7eee52.tar.gz chromium_src-413d988c3572180c145f0317791031b62e7eee52.tar.bz2 | |
Fixing collision in definitions from old use of CHROME_SRC_DIR.
Wow, this was actually used to refer to src/chrome.
Review URL: http://codereview.chromium.org/7859
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/SConscript')
| -rw-r--r-- | chrome/SConscript | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index 77f4bc5..b835408 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -245,9 +245,9 @@ if env_dll['PLATFORM'] == 'win32': env_res.RES(g) def chrome_version_emitter(target, source, env): - source.append('$CHROME_SRC_DIR/VERSION') + source.append('$CHROME_SRC_DIR/chrome/VERSION') # TODO(sgk): parameterize for chromium-vs.-google_chrome - source.append('$CHROME_SRC_DIR/app/theme/google_chrome/BRANDING') + source.append('$CHROME_SRC_DIR/chrome/app/theme/google_chrome/BRANDING') return target, source b = Builder(action = '$CHROME_VERSION_RC_COM', @@ -257,10 +257,9 @@ if env_dll['PLATFORM'] == 'win32': env.Replace( CHROME_VERSION_RC_COM = - '$VERSION_BAT $SOURCE $CHROME_SRC_DIR $PWD $TARGET', + '$VERSION_BAT $SOURCE $CHROME_SRC_DIR/chrome $PWD $TARGET', VERSION_BAT = env.File( '$CHROME_SRC_DIR/chrome/tools/build/win/version.bat'), - CHROME_SRC_DIR = env.Dir('$CHROME_SRC_DIR/chrome'), PWD = Dir('.'), ) |