Set up Android build config.

client/tools/buildbot_annotated_steps.py

 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 #!/usr/bin/python
 
 # Copyright (c) 2011 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.
 
@@ skipping 102 matching lines @@
           '--name=' + name, '--out=' + outdir]
   local_env = os.environ
   #if 'linux' in name:
   #  javahome = os.path.join(os.path.expanduser('~'), 'jdk1.6.0_25')
   #  local_env['JAVA_HOME'] = javahome
   #  local_env['PATH'] = (os.path.join(javahome, 'bin') +
   #                       os.pathsep + local_env['PATH'])
 
   return subprocess.call(cmds, env=local_env)
 
-def ProcessCompiler(name):
+def ProcessBot(name, target):
   '''
-  build and test the compiler
+  Build and test the named bot target (compiler, android, pub). We look for
+  the supporting script in tools/bots/ to run the tests and build.
   '''
-  print 'ProcessCompiler'
-  has_shell=False
-  if 'windows' in name:
-    # In Windows we need to run in the shell, so that we have all the
-    # environment variables available.
-    has_shell=True
-  return subprocess.call([sys.executable,
-      os.path.join('tools', 'bots', 'compiler.py')],
-      env=os.environ, shell=has_shell)
-
-def ProcessPub(name):
-  '''
-  Build and test pub and the pub packages in the main Dart repository.
-  '''
-  print 'ProcessPub'
+  print 'Process%s' % target.capitalize()
   has_shell=False
   if '-win' in name:
     # In Windows we need to run in the shell, so that we have all the
     # environment variables available.
     has_shell=True
   return subprocess.call([sys.executable,
-      os.path.join('tools', 'bots', 'pub.py')],
+      os.path.join('tools', 'bots', target + '.py')],
       env=os.environ, shell=has_shell)
 
 def FixJavaHome():
   buildbot_javahome = os.getenv('BUILDBOT_JAVA_HOME')
   if buildbot_javahome:
     current_pwd = os.getenv('PWD')
     java_home = os.path.join(current_pwd, buildbot_javahome)
     os.environ['JAVA_HOME'] = java_home
     print 'Setting java home to'
     print java_home
@@ skipping 57 matching lines @@
       return status
 
 
   #TODO(sigmund): remove this indirection once we update our bots
   (name, version) = GetBuildInfo()
   if name.startswith('dart-editor'):
     # TODO (danrubel) Fix dart-editor builds so that we can call FixJavaHome() before the build
     FixJavaHome()
     status = ProcessTools('release', name, version)
   elif name.startswith('pub-'):
-    status = ProcessPub(name)
+    status = ProcessBot(name, 'pub')
+  elif name.startswith('vm-android'):
+    status = ProcessBot(name, 'android')
   else:
     # The buildbot will set a BUILDBOT_JAVA_HOME relative to the dart
     # root directory, set JAVA_HOME based on that.
     FixJavaHome()
-    status = ProcessCompiler(name)
+    status = ProcessBot(name, 'compiler')
 
   if status:
     print '@@@STEP_FAILURE@@@'
 
   return status
 
 
 if __name__ == '__main__':
   sys.exit(main())