Version 1.5.3

dart/editor/build/build.py

Index: dart/editor/build/build.py
===================================================================
--- dart/editor/build/build.py	(revision 37971)
+++ dart/editor/build/build.py	(working copy)
@@ -549,7 +549,7 @@
           # 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)
@@ -813,7 +813,7 @@
       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:
 
@@ -894,6 +894,26 @@
       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:
@@ -924,6 +944,8 @@
       # (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-')):