Add an AOSP builder recipe.

scripts/slave/compile.py

Index: scripts/slave/compile.py
diff --git a/scripts/slave/compile.py b/scripts/slave/compile.py
index f807e23ddf2d53eca220487922ccd29b6f59e63d..e9e495362f3d383f85371f6e494c32afcaf575e1 100755
--- a/scripts/slave/compile.py
+++ b/scripts/slave/compile.py
@@ -688,6 +688,50 @@ def main_make(options, args):
 
   return result
 
+def main_make_android(options, args):
+  """Interprets options, clobbers object files, and calls make.
+  """
+
+  env = EchoDict(os.environ)
+  goma_ready = goma_setup(options, env)
+  if not goma_ready:
+    assert options.compiler not in ('goma', 'goma-clang')
+    assert options.goma_dir is None
+
+  options.build_dir = os.path.abspath(options.build_dir)
+
+  if goma_ready:
+    command = [os.path.join(options.goma_dir, 'goma-android-make')]
+  else:
+    command = ['make']
+
+  working_dir = options.src_dir
+
+  os.chdir(working_dir)
+
+  # V=1 prints the actual executed command
+  if options.verbose:
+    command.extend(['V=1'])
+  command.extend(options.build_args + args)
+
+  # Run the build.
+  env.print_overrides()
+  result = 0
+
+  def clobber():
+    print('Removing %s' % options.target_output_dir)
+    chromium_utils.RemoveDirectory(options.target_output_dir)
+
+  if options.clobber:
+    clobber()
+
+  result = chromium_utils.RunCommand(command, env=env)
+  if result and not options.clobber:
+    clobber()

[agable, 2013/05/22 17:21:23]

This is a little weird. We clobber if 'make' failed and we didn't clobber
previously? While that makes some sense, it seems like it should be accompanied
by retry logic. This is basically saying "aw shucks, I failed, and I don't know
why, so I guess I'll try to clean up a little for the next guy just in case."

[mkosiba (inactive), 2013/05/23 13:13:38]

uh.. yeath.. I just copied this over from main_make but I agree that it's a bit
weird.
For android we'll always be running a clobber build, so it'll probably be
clearer to hardcode it to always happen right before running make.

+
+  goma_teardown(options, env)
+
+  return result
 
 def main_ninja(options, args):
   """Interprets options, clobbers object files, and calls ninja."""
@@ -1053,6 +1097,8 @@ def get_target_build_dir(build_tool, src_dir, target, is_iphone=False):
         target + ('-iphoneos' if is_iphone else ''))
   elif build_tool in ['make', 'ninja']:
     ret = os.path.join(src_dir, 'out', target)
+  elif build_tool == 'make-android':
+    ret = os.path.join(src_dir, 'out')
   elif build_tool in ['msvs', 'vs', 'ib']:
     ret = os.path.join(src_dir, 'build', target)
   elif build_tool == 'scons':
@@ -1086,6 +1132,12 @@ def real_main():
   option_parser.add_option('', '--build-dir', default='build',
                            help='path to directory containing solution and in '
                                 'which the build output will be placed')
+  option_parser.add_option('', '--src-dir', default=None,
+                           help='path to directory containing the root of the '
+                                'source tree')

[agable, 2013/05/22 17:21:23]

*containing* the root? This makes it sound like if I have /tmp/mycheckout/src,
I'd want to pass --src-dir=/tmp/mycheckout. The code below makes it clear that
what is really expected is --src-dir=/tmp/mycheckout/src. Please clarify the
help string.

[mkosiba (inactive), 2013/05/23 13:13:38]

Done.

+  option_parser.add_option('', '--target-output-dir', default=None,
+                           help='path to directory containing the root of the '
+                                'output folder')

[agable, 2013/05/22 17:21:23]

Same here.

[mkosiba (inactive), 2013/05/23 13:13:38]

Done.

[mkosiba (inactive), 2013/05/23 13:13:38]

Done.

   option_parser.add_option('', '--mode', default='dev',
                            help='build mode (dev or official) controlling '
                                 'environment variables set during build')
@@ -1121,8 +1173,9 @@ def real_main():
   options, args = option_parser.parse_args()
 
   options.build_dir = os.path.abspath(options.build_dir)
-  options.src_dir = os.path.join(slave_utils.SlaveBaseDir(
-      os.path.abspath(options.build_dir)), 'build', 'src')
+  if not options.src_dir:
+    options.src_dir = os.path.join(slave_utils.SlaveBaseDir(
+        os.path.abspath(options.build_dir)), 'build', 'src')
 
   if options.build_tool is None:
     if chromium_utils.IsWindows():
@@ -1167,6 +1220,7 @@ def real_main():
         'ib' : main_win,
         'vs' : main_win,
         'make' : main_make,
+        'make-android' : main_make_android,
         'ninja' : main_ninja,
         'scons' : main_scons,
         'xcode' : main_xcode,