Enable manual bisects on Chrome for Android.

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 619 matching lines @@
   Returns:
     A tuple of the output and return code.
   """
   (output, return_code) = RunGit(command, cwd=cwd)
 
   assert not return_code, 'An error occurred while running'\
                           ' "git %s"' % ' '.join(command)
   return output
 
 
-def SetBuildSystemDefault(build_system):
+def SetBuildSystemDefault(build_system, use_goma):
   """Sets up any environment variables needed to build with the specified build
   system.
 
   Args:
     build_system: A string specifying build system. Currently only 'ninja' or
         'make' are supported."""
   if build_system == 'ninja':
     gyp_var = os.getenv('GYP_GENERATORS')
 
     if not gyp_var or not 'ninja' in gyp_var:
       if gyp_var:
         os.environ['GYP_GENERATORS'] = gyp_var + ',ninja'
       else:
         os.environ['GYP_GENERATORS'] = 'ninja'
 
       if IsWindows():
         os.environ['GYP_DEFINES'] = 'component=shared_library '\
             'incremental_chrome_dll=1 disable_nacl=1 fastbuild=1 '\
             'chromium_win_pch=0'
+
   elif build_system == 'make':
     os.environ['GYP_GENERATORS'] = 'make'
   else:
     raise RuntimeError('%s build not supported.' % build_system)
 
+  if use_goma:
+    os.environ['GYP_DEFINES'] = '%s %s' % (os.getenv('GYP_DEFINES', ''),
+                                              'use_goma=1')
+
 
 def BuildWithMake(threads, targets, build_type='Release'):
   cmd = ['make', 'BUILDTYPE=%s' % build_type]
 
   if threads:
     cmd.append('-j%d' % threads)
 
   cmd += targets
 
   return_code = RunProcess(cmd)
@@ skipping 67 matching lines @@
     """
     if IsWindows():
       if not opts.build_preference:
         opts.build_preference = 'msvs'
 
       if opts.build_preference == 'msvs':
         if not os.getenv('VS100COMNTOOLS'):
           raise RuntimeError(
               'Path to visual studio could not be determined.')
       else:
-        SetBuildSystemDefault(opts.build_preference)
+        SetBuildSystemDefault(opts.build_preference, opts.use_goma)
     else:
       if not opts.build_preference:
         if 'ninja' in os.getenv('GYP_GENERATORS'):
           opts.build_preference = 'ninja'
         else:
           opts.build_preference = 'make'
 
-      SetBuildSystemDefault(opts.build_preference)
+      SetBuildSystemDefault(opts.build_preference, opts.use_goma)
 
     if not bisect_utils.SetupPlatformBuildEnvironment(opts):
       raise RuntimeError('Failed to set platform environment.')
 
   @staticmethod
   def FromOpts(opts):
     builder = None
     if opts.target_platform == 'cros':
       builder = CrosBuilder(opts)
     elif opts.target_platform == 'android':
@@ skipping 1594 matching lines @@
     return_code = RunProcess(cmd)
     os.chdir(cwd)
     return not return_code
 
   def PerformPreSyncCleanup(self, revision, depot):
     """Performs any necessary cleanup before syncing.
 
     Returns:
       True if successful.
     """
-    if depot == 'chromium':
+    if depot == 'chromium' or depot == 'android-chrome':
       # Removes third_party/libjingle. At some point, libjingle was causing
       # issues syncing when using the git workflow (crbug.com/266324).
+      os.chdir(self.src_cwd)
       if not bisect_utils.RemoveThirdPartyDirectory('libjingle'):
         return False
       # Removes third_party/skia. At some point, skia was causing
       #  issues syncing when using the git workflow (crbug.com/377951).
       if not bisect_utils.RemoveThirdPartyDirectory('skia'):
         return False
-      return self.PerformWebkitDirectoryCleanup(revision)
+      if depot == 'chromium':
+        # The fast webkit cleanup doesn't work for android_chrome
+        # The switch from Webkit to Blink that this deals with now happened
+        # quite a long time ago so this is unlikely to be a problem.
+        return self.PerformWebkitDirectoryCleanup(revision)
     elif depot == 'cros':
       return self.PerformCrosChrootCleanup()
     return True
 
   def RunPostSync(self, depot):
     """Performs any work after syncing.
 
     Returns:
       True if successful.
     """
@@ skipping 1364 matching lines @@
                      help='Path to a script which can be used to modify '
                      'the bisect script\'s behavior.')
     group.add_option('--cros_board',
                      type='str',
                      help='The cros board type to build.')
     group.add_option('--cros_remote_ip',
                      type='str',
                      help='The remote machine to image to.')
     group.add_option('--use_goma',
                      action="store_true",
-                     help='Add a bunch of extra threads for goma.')
+                     help='Add a bunch of extra threads for goma, and enable '
+                     'goma')
     group.add_option('--output_buildbot_annotations',
                      action="store_true",
                      help='Add extra annotation output for buildbot.')
     group.add_option('--gs_bucket',
                      default='',
                      dest='gs_bucket',
                      type='str',
                      help=('Name of Google Storage bucket to upload or '
                      'download build. e.g., chrome-perf'))
     group.add_option('--target_arch',
@@ skipping 183 matching lines @@
       # The perf dashboard scrapes the "results" step in order to comment on
       # bugs. If you change this, please update the perf dashboard as well.
       bisect_utils.OutputAnnotationStepStart('Results')
     print 'Error: %s' % e.message
     if opts.output_buildbot_annotations:
       bisect_utils.OutputAnnotationStepClosed()
   return 1
 
 if __name__ == '__main__':
   sys.exit(main())