Add an AOSP builder recipe.

scripts/slave/compile.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """A tool to build chrome, executed by buildbot.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 670 matching lines @@
 
   target_command = command + ['BUILDTYPE=' + options.target]
   result = chromium_utils.RunCommand(target_command, env=env)
   if result and not options.clobber:
     clobber()
 
   goma_teardown(options, env)
 
   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)
+
+  # The Android.mk build system handles deps differently than the 'regular'
+  # Chromium makefiles which can lead to targets not being rebuilt properly.
+  # Fixing this is actually quite hard so we make this bot always clobber.
+  clobber()
+
+  result = chromium_utils.RunCommand(command, env=env)
+
+  goma_teardown(options, env)
+
+  return result
 
 def main_ninja(options, args):
   """Interprets options, clobbers object files, and calls ninja."""
 
   # Prepare environment.
   env = EchoDict(os.environ)
   orig_compiler = options.compiler
   goma_ready = goma_setup(options, env)
   if not goma_ready:
     assert options.compiler not in ('goma', 'goma-clang')
@@ skipping 345 matching lines @@
 
 
 def get_target_build_dir(build_tool, src_dir, target, is_iphone=False):
   """Keep this function in sync with src/build/landmines.py"""
   ret = None
   if build_tool == 'xcode':
     ret = os.path.join(src_dir, 'xcodebuild',
         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':
     ret = os.path.join(src_dir, 'sconsbuild', target)
   else:
     raise NotImplementedError()
   return os.path.abspath(ret)
 
 
 def real_main():
@@ skipping 13 matching lines @@
                            help='build target (Debug or Release)')
   option_parser.add_option('', '--arch', default=None,
                            help='target architecture (ia32, x64, ...')
   option_parser.add_option('', '--solution', default=None,
                            help='name of solution/sub-project to build')
   option_parser.add_option('', '--project', default=None,
                            help='name of project to build')
   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 the root of the source tree')
+  option_parser.add_option('', '--target-output-dir', default=None,
+                           help='path to the output folder')
   option_parser.add_option('', '--mode', default='dev',
                            help='build mode (dev or official) controlling '
                                 'environment variables set during build')
   option_parser.add_option('', '--build-tool', default=None,
                            help='specify build tool (ib, vs, scons, xcode)')
   option_parser.add_option('', '--build-args', action='append', default=[],
                            help='arguments to pass to the build tool')
   option_parser.add_option('', '--compiler', default=None,
                            help='specify alternative compiler (e.g. clang)')
   if chromium_utils.IsWindows():
@@ skipping 15 matching lines @@
     option_parser.add_option('', '--disable-aslr', action='store_true',
                              default=False, help='disable ASLR on OS X 10.6')
   option_parser.add_option('', '--goma-dir',
                            default=os.path.join(BUILD_DIR, 'goma'),
                            help='specify goma directory')
   option_parser.add_option('--verbose', action='store_true')
 
   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():
       main = main_win
       options.build_tool = 'msvs'
     elif chromium_utils.IsMac():
       main = main_xcode
       options.build_tool = 'xcode'
     elif chromium_utils.IsLinux():
       # We're in the process of moving to ninja by default on Linux, see
@@ skipping 24 matching lines @@
         main = main_make
         options.build_tool = 'make'
     else:
       print('Please specify --build-tool.')
       return 1
   else:
     build_tool_map = {
         'ib' : main_win,
         'vs' : main_win,
         'make' : main_make,
+        'make-android' : main_make_android,
         'ninja' : main_ninja,
         'scons' : main_scons,
         'xcode' : main_xcode,
     }
     main = build_tool_map.get(options.build_tool)
     if not main:
       sys.stderr.write('Unknown build tool %s.\n' % repr(options.build_tool))
       return 2
 
   options.target_output_dir = get_target_build_dir(options.build_tool,
       options.src_dir, options.target, 'iphoneos' in args)
   options.clobber = (options.clobber or
       landmines_triggered(options.target_output_dir))
 
   return main(options, args)
 
 
 if '__main__' == __name__:
   sys.exit(real_main())