Switch to building Chromium rather than Google Chrome by default.

The official builder will need the CHROMIUM_BUILD environment variable set to "_google_chrome".

Same as Rietveld issue 2943, approved by nsylvain and rahulk, but in the writeable repository rather than the read-only one.

BUG=1296800
TEST=covered by buildbots

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

6 files changed, 3 insertions, 14 deletions

diff --git a/build/debug.vsprops b/build/debug.vsprops
index 61b2230..681f26b 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_google_chrome.vsprops"
+	InheritedPropertySheets=".\internal\essential.vsprops;internal\chromium_build$(CHROMIUM_BUILD).vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/build/release.vsprops b/build/release.vsprops
index c421b10..d320464 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_google_chrome.vsprops"
+	InheritedPropertySheets="internal\release_impl$(CHROME_BUILD_TYPE).vsprops;internal\chromium_build$(CHROMIUM_BUILD).vsprops"
 	>
 </VisualStudioPropertySheet>
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py
index 024f8b3..95b3110 100644
--- a/chrome/tools/build/win/create_installer_archive.py
+++ b/chrome/tools/build/win/create_installer_archive.py
@@ -93,9 +93,6 @@ 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 fc24088..6423866 100644
--- a/chrome/tools/build/win/html_inline.py
+++ b/chrome/tools/build/win/html_inline.py
@@ -19,9 +19,7 @@ import sys
 import base64
 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 = 'GOOGLE_CHROME'
+DIST_DEFAULT = 'CHROMIUM'
 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 1c43ca5..93bb162 100644
--- a/chrome/tools/build/win/version.bat
+++ b/chrome/tools/build/win/version.bat
@@ -15,9 +15,6 @@ 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 7d62e41..022c54f 100644
--- a/rlz/copy_files.bat
+++ b/rlz/copy_files.bat
@@ -6,9 +6,6 @@ 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%