Rollback 1529.

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

7 files changed, 13 insertions, 3 deletions

diff --git a/build/debug.vsprops b/build/debug.vsprops
index 681f26b..61b2230 100644
--- a/build/debug.vsprops
+++ b/build/debug.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="debug"
-	InheritedPropertySheets=".\internal\essential.vsprops;internal\chromium_build$(CHROMIUM_BUILD).vsprops"
+	InheritedPropertySheets=".\internal\essential.vsprops;internal\chromium_build_google_chrome.vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/build/release.vsprops b/build/release.vsprops
index d320464..c421b10 100644
--- a/build/release.vsprops
+++ b/build/release.vsprops
@@ -3,6 +3,6 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="release"
-	InheritedPropertySheets="internal\release_impl$(CHROME_BUILD_TYPE).vsprops;internal\chromium_build$(CHROMIUM_BUILD).vsprops"
+	InheritedPropertySheets="internal\release_impl$(CHROME_BUILD_TYPE).vsprops;internal\chromium_build_google_chrome.vsprops"
 	>
 </VisualStudioPropertySheet>
diff --git a/chrome/app/chrome.exe.deps b/chrome/app/chrome.exe.deps
index 0daa3e2..9873072 100644
--- a/chrome/app/chrome.exe.deps
+++ b/chrome/app/chrome.exe.deps
@@ -5,6 +5,7 @@ dependents = [
   'USER32.dll',

   'ADVAPI32.dll',

   'SHELL32.dll',

+  'VERSION.dll',

 ]

 

 delay_loaded = [

diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py
index a4b5eb8..aa154f9 100644
--- a/chrome/tools/build/win/create_installer_archive.py
+++ b/chrome/tools/build/win/create_installer_archive.py
@@ -93,6 +93,9 @@ def CopyAllFilesToStagingDir(config, distribution, staging_dir, output_dir):
   Copies all common files required for various distributions of Chromium and
   also files for the specific Chromium build specified by distribution.
   """
+  # TODO(rahulk) remove the line below once we have setup environment variable
+  # CHROMIUM_BUILD on buildbots appropriately.
+  distribution = '_google_chrome'
   CopySectionFilesToStagingDir(config, 'GENERAL', staging_dir, output_dir)
   if distribution:
     if len(distribution) > 1 and distribution[0] == '_':
diff --git a/chrome/tools/build/win/html_inline.py b/chrome/tools/build/win/html_inline.py
index d3e4334..fc24088 100644
--- a/chrome/tools/build/win/html_inline.py
+++ b/chrome/tools/build/win/html_inline.py
@@ -21,7 +21,7 @@ import mimetypes
 
 # TODO(rahulk) The default here will change to 'CHROMIUM' as soon as the buildbots
 # are ready with the correct environment variable
-DIST_DEFAULT = 'CHROMIUM'
+DIST_DEFAULT = 'GOOGLE_CHROME'
 DIST_ENV_VAR = 'CHROMIUM_BUILD'
 DIST_SUBSTR = '%DISTRIBUTION%'
 
diff --git a/chrome/tools/build/win/version.bat b/chrome/tools/build/win/version.bat
index 93bb162..1c43ca5 100644
--- a/chrome/tools/build/win/version.bat
+++ b/chrome/tools/build/win/version.bat
@@ -15,6 +15,9 @@ call %SolutionDir%\..\third_party\cygwin\setup_env.bat
 :: Load version digits as environment variables
 cat %SolutionDir%\VERSION | sed "s/\(.*\)/set \1/" > %VarsBat%
 
+REM TODO(rahulk) this line will be removed once google chrome buildbots are setup properly
+set CHROMIUM_BUILD="_google_chrome"
+
 :: Load branding strings as environment variables
 set Distribution="chromium"
 if "%CHROMIUM_BUILD%" == "_google_chrome" set Distribution="google_chrome"
diff --git a/rlz/copy_files.bat b/rlz/copy_files.bat
index 022c54f..7d62e41 100644
--- a/rlz/copy_files.bat
+++ b/rlz/copy_files.bat
@@ -6,6 +6,9 @@ setlocal
 set InputPath=%~1
 set OutDir=%~2
 
+REM Remove this line when we start setting CHROMIUM_BUILD option on buildbots
+set CHROMIUM_BUILD=_google_chrome
+
 if NOT "%CHROMIUM_BUILD%" == "_google_chrome" goto END
 
 xcopy /R /C /Y %InputPath% %OutDir%