Unset some environment vars so they can be set up via the bisect script.

tools/bisect_utils.py

 # Copyright (c) 2013 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.
 
 """Set of operations/utilities related to checking out the depot, and
 outputting annotations on the buildbot waterfall. These are intended to be
 used by the bisection scripts."""
 
 import errno
 import os
@@ skipping 23 matching lines @@
 
 REPO_PARAMS = [
   'https://chrome-internal.googlesource.com/chromeos/manifest-internal/',
   '--repo-url',
   'https://git.chromium.org/external/repo.git'
 ]
 
 REPO_SYNC_COMMAND = 'git checkout -f $(git rev-list --max-count=1 '\
                     '--before=%d remotes/m/master)'
 
+ORIGINAL_ENV = {}
+
 def OutputAnnotationStepStart(name):
   """Outputs appropriate annotation to signal the start of a step to
   a trybot.
 
   Args:
     name: The name of the step.
   """
   print
   print '@@@SEED_STEP %s@@@' % name
   print '@@@STEP_CURSOR %s@@@' % name
@@ skipping 222 matching lines @@
   passed = False
 
   if not RunRepo(cmd):
     if not RunRepo(['sync']):
       passed = True
   os.chdir(cwd)
 
   return passed
 
 
+def CopyAndSaveOriginalEnvironmentVars():
+  """Makes a copy of the current environment variables."""
+  # TODO: Waiting on crbug.com/255689, will remove this after.
+  vars_to_remove = []
+  for k, v in os.environ.iteritems():
+    if 'ANDROID' in k:
+      vars_to_remove.append(k)
+  vars_to_remove.append('CHROME_SRC')
+  vars_to_remove.append('CHROMIUM_GYP_FILE')
+  vars_to_remove.append('GOMA_DIR')
+  vars_to_remove.append('GYP_CROSSCOMPILE')
+  vars_to_remove.append('GYP_DEFINES')
+  vars_to_remove.append('GYP_GENERATORS')
+  vars_to_remove.append('GYP_GENERATOR_FLAGS')
+  vars_to_remove.append('OBJCOPY')
+  for k in vars_to_remove:
+    if os.environ.has_key(k):
+      del os.environ[k]
+
+  global ORIGINAL_ENV
+  ORIGINAL_ENV = os.environ.copy()
+
+
 def SetupAndroidBuildEnvironment(opts):
   """Sets up the android build environment.
 
   Args:
     opts: The options parsed from the command line through parse_args().
     path_to_file: Path to the bisect script's directory.
 
   Returns:
     True if successful.
   """
+
+  # Revert the environment variables back to default before setting them up
+  # with envsetup.sh.
+  env_vars = os.environ.copy()
+  for k, _ in env_vars.iteritems():
+    del os.environ[k]
+  for k, v in ORIGINAL_ENV.iteritems():
+    os.environ[k] = v
+
   path_to_file = os.path.join('build', 'android', 'envsetup.sh')
   proc = subprocess.Popen(['bash', '-c', 'source %s && env' % path_to_file],
                            stdout=subprocess.PIPE,
                            stderr=subprocess.PIPE,
                            cwd='src')
   (out, _) = proc.communicate()
 
   for line in out.splitlines():
     (k, _, v) = line.partition('=')
     os.environ[k] = v
   return not proc.returncode
 
 
 def SetupPlatformBuildEnvironment(opts):
   """Performs any platform specific setup.
 
   Args:
     opts: The options parsed from the command line through parse_args().
     path_to_file: Path to the bisect script's directory.
 
   Returns:
     True if successful.
   """
   if opts.target_platform == 'android':
+    CopyAndSaveOriginalEnvironmentVars()
     return SetupAndroidBuildEnvironment(opts)
   elif opts.target_platform == 'cros':
     return SetupCrosRepo()
 
   return True
 
 
 def CreateBisectDirectoryAndSetupDepot(opts, reset=False):
   """Sets up a subdirectory 'bisect' and then retrieves a copy of the depot
   there using gclient.
 
   Args:
     opts: The options parsed from the command line through parse_args().
     reset: Whether to reset any changes to the depot.
 
   Returns:
     Returns 0 on success, otherwise 1.
   """
   if not CreateAndChangeToSourceDirectory(opts.working_directory):
     print 'Error: Could not create bisect directory.'
     print
     return 1
 
   if not SetupGitDepot(opts, reset):
     print 'Error: Failed to grab source.'
     print
     return 1
 
   return 0