First pass android support in 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
 import shutil
 import subprocess
+import sys
 
 
 GCLIENT_SPEC = """
 solutions = [
   { "name"        : "src",
     "url"         : "https://chromium.googlesource.com/chromium/src.git",
     "deps_file"   : ".DEPS.git",
     "managed"     : True,
     "custom_deps" : {
       "src/data/page_cycler": "https://chrome-internal.googlesource.com/" +
                               "chrome/data/page_cycler/.git",
       "src/tools/perf/data": "https://chrome-internal.googlesource.com/" +
                              "chrome/tools/perf/data/.git",
       "src/v8_bleeding_edge": "git://github.com/v8/v8.git",
     },
     "safesync_url": "",
   },
 ]
 """
 GCLIENT_SPEC = ''.join([l for l in GCLIENT_SPEC.splitlines()])
+GCLIENT_SPEC_ANDROID = GCLIENT_SPEC + "\ntarget_os = ['android']"
 FILE_DEPS_GIT = '.DEPS.git'
 
 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)'
@@ skipping 92 matching lines @@
     params: Unix timestamp to sync to.
 
   Returns:
     The return code of the call.
   """
   repo_sync = REPO_SYNC_COMMAND % timestamp
   cmd = ['forall', '-c', REPO_SYNC_COMMAND % timestamp]
   return RunRepo(cmd)
 
 
-def RunGClientAndCreateConfig():
+def RunGClientAndCreateConfig(opts):
   """Runs gclient and creates a config containing both src and src-internal.
 
+  Args:
+    opts: The options parsed from the command line through parse_args().
+
   Returns:
     The return code of the call.
   """
+  spec = GCLIENT_SPEC
+  if opts.target_platform == 'android':
+    spec = GCLIENT_SPEC_ANDROID
+
   return_code = RunGClient(
-      ['config', '--spec=%s' % GCLIENT_SPEC, '--git-deps'])
+      ['config', '--spec=%s' % spec, '--git-deps'])
   return return_code
 
 
 def IsDepsFileBlink():
   """Reads .DEPS.git and returns whether or not we're using blink.
 
   Returns:
     True if blink, false if webkit.
   """
   locals = {'Var': lambda _: locals["vars"][_],
@@ skipping 20 matching lines @@
 
 def RunGClientAndSync(reset):
   """Runs gclient and does a normal sync.
 
   Args:
     reset: Whether to reset any changes to the depot.
 
   Returns:
     The return code of the call.
   """
-  params = ['sync', '--verbose']
+  params = ['sync', '--verbose', '--nohooks']
   if reset:
     params.extend(['--reset', '--force', '--delete_unversioned_trees'])
   return RunGClient(params)
 
 
-def SetupGitDepot(output_buildbot_annotations, reset):
+def SetupGitDepot(opts, reset):
   """Sets up the depot for the bisection. The depot will be located in a
   subdirectory called 'bisect'.
 
   Args:
+    opts: The options parsed from the command line through parse_args().
     reset: Whether to reset any changes to the depot.
 
   Returns:
     True if gclient successfully created the config file and did a sync, False
     otherwise.
   """
   name = 'Setting up Bisection Depot'
 
-  if output_buildbot_annotations:
+  if opts.output_buildbot_annotations:
     OutputAnnotationStepStart(name)
 
   passed = False
 
-  if not RunGClientAndCreateConfig():
+  if not RunGClientAndCreateConfig(opts):
     passed_deps_check = True
     if os.path.isfile(os.path.join('src', FILE_DEPS_GIT)):
       cwd = os.getcwd()
       os.chdir('src')
       if not IsDepsFileBlink():
         passed_deps_check = RemoveThirdPartyWebkitDirectory()
       else:
         passed_deps_check = True
       os.chdir(cwd)
 
     if passed_deps_check and not RunGClientAndSync(reset):
       passed = True
 
-  if output_buildbot_annotations:
+  if opts.output_buildbot_annotations:
     print
     OutputAnnotationStepClosed()
 
   return passed
 
 
 def SetupCrosRepo():
   """Sets up cros repo for bisecting chromeos.
 
   Returns:
@@ skipping 12 matching lines @@
   passed = False
 
   if not RunRepo(cmd):
     if not RunRepo(['sync']):
       passed = True
   os.chdir(cwd)
 
   return passed
 
 
+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.
+  """
+  cwd = os.getcwd()
+  os.chdir('src')

[tonyg, 2013/06/07 22:02:26]

Rather than doing this dance of changing the dir and then changing back, you can
just pass cwd=src to Popen().

[shatch, 2013/06/07 22:29:05]

Done.

+  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,
+                           bufsize=0)

[tonyg, 2013/06/07 22:02:26]

bufsize isn't necessary, is it?

[shatch, 2013/06/07 22:29:05]

Done.

+  (out, _) = proc.communicate()
+  os.chdir(cwd)
+
+  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':
+    return SetupAndroidBuildEnvironment(opts)
+  elif opts.target_platform == 'cros':
+    return SetupCrosRepo()
+
+  return False
+
+
 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.output_buildbot_annotations, reset):
+  if not SetupGitDepot(opts, reset):
     print 'Error: Failed to grab source.'
     print
     return 1
 
   return 0