Version 1.5.3

dart/editor/build/build.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013, 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.
 
 import glob
 import gsutil
 import imp
 import optparse
@@ skipping 531 matching lines @@
           RunEditorTests(buildout, buildos)
 
         if buildos:
           StartBuildStep('upload_artifacts')
 
           _InstallArtifacts(buildout, buildos, extra_artifacts)
 
           # dart-editor-linux.gtk.x86.zip --> darteditor-linux-32.zip
           RenameRcpZipFiles(buildout)
 
-          PostProcessEditorBuilds(buildout, buildos)
+          PostProcessEditorBuilds(buildout, buildos, gsu)
 
           if running_on_buildbot:
             version_file = _FindVersionFile(buildout)
             if version_file:
               DartArchiveUploadVersionFile(version_file)
 
             found_zips = _FindRcpZipFiles(buildout)
             for zipfile in found_zips:
               DartArchiveUploadEditorZipFile(zipfile)
 
@@ skipping 243 matching lines @@
     "dart-editor-win32.win32.x86.zip"     : "darteditor-win32-32.zip",
     "dart-editor-win32.win32.x86_64.zip"  : "darteditor-win32-64.zip",
   }
 
   for zipFile in _FindRcpZipFiles(out_dir):
     basename = os.path.basename(zipFile)
     if renameMap[basename] != None:
       os.rename(zipFile, join(os.path.dirname(zipFile), renameMap[basename]))
 
 
-def PostProcessEditorBuilds(out_dir, buildos):
+def PostProcessEditorBuilds(out_dir, buildos, gsu):
   """Post-process the created RCP builds"""
   with utils.TempDir('editor_scratch') as scratch_dir:
 
     def instantiate_download_script_template(destination, replacements):
       """Helper function for replacing variables in the
       tools/dartium/download_shellscript_templates.{sh,bat} scripts. It will
       write the final download script to [destination] after doing all
       replacements given in the [replacements] dictionary."""
       template_location = {
        'win' : join(
@@ skipping 60 matching lines @@
       dartium_download_script = join(scratch_dir, 'download_dartium_debug')
       instantiate_download_script_template(dartium_download_script, {
         'VAR_DESTINATION' : dartium_debug_name,
         'VAR_DOWNLOAD_URL' :
             ("http://dartlang.org/editor/update/channels/%s/%s/dartium/%s"
              % (CHANNEL, REVISION, dartium_debug_name)),
       })
       f.AddFile(dartium_download_script,
           'dart/chromium/download_dartium_debug%s' % shell_ending)
 
+    def add_android_content_shell(zipFile):
+      # On bleeding edge we take the latest bits, we don't want to wait
+      # for the dartium builders to finish.
+      revision = 'latest' if CHANNEL == 'be' else REVISION
+      with utils.TempDir('apk') as tempDir:
+        namer = bot_utils.GCSNamer(CHANNEL)
+        content_shell_name = 'content_shell-android'
+        apkName = namer.dartium_android_apk_filename(content_shell_name,
+                                                     'arm',
+                                                     'release')
+        remoteApk = namer.dartium_android_apk_filepath(revision,
+                                                       content_shell_name,
+                                                       'arm',
+                                                       'release')
+        local_path = os.path.join(tempDir, apkName)
+        if gsu.Copy(remoteApk, local_path, False):
+          raise Exception("gsutil command failed, aborting.")
+        f = ziputils.ZipUtil(zipFile, buildos)
+        f.AddFile(local_path, 'dart/android/%s' % apkName)
+
     # Create a editor.properties
     editor_properties = os.path.join(scratch_dir, 'editor.properties')
     with open(editor_properties, 'w') as fd:
       fd.write("com.dart.tools.update.core.url=http://dartlang.org"
                "/editor/update/channels/%s/\n" % CHANNEL)
 
     for zipFile in _FindRcpZipFiles(out_dir):
       basename = os.path.basename(zipFile)
       is_64bit = basename.endswith('-64.zip')
 
@@ skipping 10 matching lines @@
       # pointing to the correct update location of the editor for the channel
       # we're building for.
       if CHANNEL != 'be':
         f = ziputils.ZipUtil(zipFile, buildos)
         f.AddFile(editor_properties, 'dart/editor.properties')
 
       # Add a shell/bat script to download contentshell and dartium debug.
       # (including the necessary tools/dartium/download_file.dart helper).
       add_download_scripts(zipFile, '64' if is_64bit else '32')
 
+      add_android_content_shell(zipFile)
+
       # adjust memory params for 64 bit versions
       if is_64bit:
         if (basename.startswith('darteditor-macos-')):
           inifile = join('dart', 'DartEditor.app', 'Contents', 'MacOS',
                          'DartEditor.ini')
         else:
           inifile = join('dart', 'DartEditor.ini')
 
         if (basename.startswith('darteditor-win32-')):
           f = zipfile.ZipFile(zipFile)
@@ skipping 313 matching lines @@
 def FileDelete(f):
   """delete the given file - do not re-throw any exceptions that occur"""
   if os.path.exists(f):
     try:
       os.remove(f)
     except OSError:
       print 'error deleting %s' % f
 
 if __name__ == '__main__':
   sys.exit(main())