Set CHROMIUM_BUILD and friends when building with ninja too.

scripts/slave/compile.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A tool to build chrome, executed by buildbot.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 487 matching lines @@
   dist_text = dist_file.read().strip()
   dist_file.close()
   codename = None
   for line in dist_text.splitlines():
     match_data = re.match(r'^DISTRIB_CODENAME=(\w+)$', line)
     if match_data:
       codename = match_data.group(1)
   return codename
 
 
+def maybe_set_official_build_envvars(options, env):
+  if options.mode == 'google_chrome' or options.mode == 'official':
+    env['CHROMIUM_BUILD'] = '_google_chrome'
+
+  if options.mode == 'official':
+    # Official builds are always Google Chrome.
+    env['OFFICIAL_BUILD'] = '1'
+    env['CHROME_BUILD_TYPE'] = '_official'
+
+
 def common_make_settings(
     command, options, env, crosstool=None, compiler=None):
   """
   Sets desirable environment variables and command-line options
   that are common to the Make and SCons builds. Used on Linux
   and for the mac make build.
   """
   assert compiler in (None, 'clang', 'goma', 'goma-clang', 'jsonclang')
-  if options.mode == 'google_chrome' or options.mode == 'official':
-    env['CHROMIUM_BUILD'] = '_google_chrome'
-
-  if options.mode == 'official':
-    # Official builds are always Google Chrome.
-    env['OFFICIAL_BUILD'] = '1'
-    env['CHROME_BUILD_TYPE'] = '_official'
+  maybe_set_official_build_envvars(options, env)
 
   # Don't stop at the first error.
   command.append('-k')
 
   # Set jobs parallelization based on number of cores.
   jobs = os.sysconf('SC_NPROCESSORS_ONLN')
 
   # Test if we can use ccache.
   ccache = ''
   if chromium_utils.IsLinux():
@@ skipping 193 matching lines @@
     # For now, only delete all non-.ninja files. TODO(thakis): Make "clobber" a
     # step that runs before "runhooks". Once the master has been restarted,
     # remove all clobber handling from compile.py.
     ninja_clobber(options.target_output_dir)
 
   if options.verbose:
     command.append('-v')
   command.extend(options.build_args)
   command.extend(args)
 
+  maybe_set_official_build_envvars(options, env)
+
   if options.llvm_tsan:
     # Do not report thread leaks when running executables compiled with TSan.
     # http://dev.chromium.org/developers/testing/threadsanitizer-tsan-v2
     # contains other options that might be worth adding.
     env['TSAN_OPTIONS'] = 'report_thread_leaks=0'
 
   if chromium_utils.IsMac() and options.disable_aslr:
     # Disallow dyld to randomize the load addresses of executables.
     # If any of them is compiled with ASan it will hang otherwise.
     env['DYLD_NO_PIE'] = '1'
@@ skipping 182 matching lines @@
     # Bug 1064677 for more details.
     if not options.keep_version_file:
       chromium_utils.RemoveFile(options.target_output_dir, 'obj', 'chrome_dll',
                                 'chrome_dll_version.rc')
 
   env = EchoDict(os.environ)
 
   # no goma support yet for this build tool.
   assert options.compiler != 'goma'
 
-  if options.mode == 'google_chrome' or options.mode == 'official':
-    env['CHROMIUM_BUILD'] = '_google_chrome'
-
-  if options.mode == 'official':
-    # Official builds are always Google Chrome.
-    env['OFFICIAL_BUILD'] = '1'
-    env['CHROME_BUILD_TYPE'] = '_official'
+  maybe_set_official_build_envvars(options, env)
 
   if not options.solution:
     options.solution = 'all.sln'
 
   result = -1
   solution = os.path.join(options.build_dir, options.solution)
   command = [tool, solution] + tool_options + args
   errors = []
   # Examples:
   # midl : command line error MIDL1003 : error returned by the C
@@ skipping 239 matching lines @@
   options.target_output_dir = get_target_build_dir(options.build_tool,
       options.src_dir, options.target, 'iphoneos' in args)
   options.clobber = (options.clobber or
       landmines_triggered(options.target_output_dir))
 
   return main(options, args)
 
 
 if '__main__' == __name__:
   sys.exit(real_main())