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

tools/bisect-perf-regression.py

 #!/usr/bin/env python
 # 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.
 
 """Performance Test Bisect Tool
 
 This script bisects a series of changelists using binary search. It starts at
 a bad revision where a performance metric has regressed, and asks for a last
 known-good revision. It will then binary search across this revision range by
@@ skipping 276 matching lines @@
     A tuple of the output and return code.
   """
   (output, return_code) = RunGit(command)
 
   assert not return_code, 'An error occurred while running'\
                           ' "git %s"' % ' '.join(command)
   return output
 
 
 def BuildWithMake(threads, targets):
-  cmd = ['make', 'BUILDTYPE=Release', '-j%d' % threads] + targets
+  cmd = ['make', 'BUILDTYPE=Release']
+
+  if threads:
+    cmd.append('-j%d' % threads)
+
+  cmd += targets
 
   return_code = RunProcess(cmd)
 
   return not return_code
 
 
 def BuildWithNinja(threads, targets):
-  cmd = ['ninja', '-C', os.path.join('out', 'Release'),
-      '-j%d' % threads] + targets
+  cmd = ['ninja', '-C', os.path.join('out', 'Release')]
+
+  if threads:
+    cmd.append('-j%d' % threads)
+
+  cmd += targets
 
   return_code = RunProcess(cmd)
 
   return not return_code
 
 
 def BuildWithVisualStudio(targets):
   path_to_devenv = os.path.abspath(
       os.path.join(os.environ['VS100COMNTOOLS'], '..', 'IDE', 'devenv.com'))
   path_to_sln = os.path.join(os.getcwd(), 'chrome', 'chrome.sln')
@@ skipping 22 matching lines @@
 
     Args:
         depot: Current depot being bisected.
         opts: The options parsed from the command line.
 
     Returns:
         True if build was successful.
     """
     targets = ['chrome', 'performance_ui_tests']
 
-    threads = 16
+    threads = None
     if opts.use_goma:
       threads = 64
 
     build_success = False
     if opts.build_preference == 'make':
       build_success = BuildWithMake(threads, targets)
     elif opts.build_preference == 'ninja':
       if IsWindows():
         targets = [t + '.exe' for t in targets]
       build_success = BuildWithNinja(threads, targets)
@@ skipping 10 matching lines @@
   def InstallAPK(self, opts):
     """Installs apk to device.
 
     Args:
         opts: The options parsed from the command line.
 
     Returns:
         True if successful.
     """
     path_to_tool = os.path.join('build', 'android', 'adb_install_apk.py')
-    cmd = [path_to_tool, '--apk', 'ContentShell.apk', '--apk_package',
-        'org.chromium.content_shell_apk', '--release']
+    cmd = [path_to_tool, '--apk', 'ChromiumTestShell.apk', '--apk_package',
+           'org.chromium.chrome.testshell', '--release']
     return_code = RunProcess(cmd)
+
     return not return_code
 
   def Build(self, depot, opts):
     """Builds the android content shell and other necessary tools using options
     passed into the script.
 
     Args:
         depot: Current depot being bisected.
         opts: The options parsed from the command line.
 
     Returns:
         True if build was successful.
     """
-    targets = ['content_shell_apk', 'forwarder2', 'md5sum']
-    threads = 16
+    targets = ['chromium_testshell', 'forwarder2', 'md5sum']
+    threads = None
     if opts.use_goma:
       threads = 64
 
     build_success = False
     if opts.build_preference == 'ninja':
       build_success = BuildWithNinja(threads, targets)
     else:
       assert False, 'No build system defined.'
 
     if build_success:
@@ skipping 110 matching lines @@
 
     ie. gclient sync --revision <revision>
 
     Args:
       revision: The git SHA1 or svn CL (depending on workflow).
 
     Returns:
       The return code of the call.
     """
     return bisect_utils.RunGClient(['sync', '--revision',
-        revision, '--verbose'])
+        revision, '--verbose', '--nohooks'])
 
   def SyncToRevisionWithRepo(self, timestamp):
     """Uses repo to sync all the underlying git depots to the specified
     time.
 
     Args:
       timestamp: The unix timestamp to sync to.
 
     Returns:
       The return code of the call.
@@ skipping 639 matching lines @@
     elif depot == 'cros':
       return self.PerformCrosChrootCleanup()
     return True
 
   def RunPostSync(self, depot):
     """Performs any work after syncing.
 
     Returns:
       True if successful.
     """
+    if self.opts.target_platform == 'android':
+      cwd = os.getcwd()
+      os.chdir(os.path.join(self.src_cwd, '..'))
+      if not bisect_utils.SetupAndroidBuildEnvironment(self.opts):
+        return False
+      os.chdir(cwd)
+
     if depot == 'cros':
       return self.CreateCrosChroot()
     else:
       return self.RunGClientHooks()
     return True
 
   def ShouldSkipRevision(self, depot, revision):
     """Some commits can be safely skipped (such as a DEPS roll), since the tool
     is git based those changes would have no effect.
 
@@ skipping 1133 matching lines @@
 
   if not(bisect_results['error']):
     return 0
   else:
     print 'Error: ' + bisect_results['error']
     print
     return 1
 
 if __name__ == '__main__':
   sys.exit(main())