Reland 33381, always use the dart repo version of gsutil for apk archiving

tools/bots/dartium_android.py

 #!/usr/bin/python
 # Copyright (c) 2014, 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.
 
 """
 Dartium on Android buildbot steps.
 
 Runs steps after the buildbot builds Dartium on Android,
 which should upload the APK to an attached device, and run
@@ skipping 26 matching lines @@
 def UploadSetACL(gsutil, local, remote):
   gsutil.upload(local, remote)
   gsutil.setGroupReadACL(remote, 'google.com')
   gsutil.setContentType(remote, 'application/vnd.android.package-archive')
   
 
 def UploadAPKs(options):
   with bot.BuildStep('Upload apk'):
     revision = utils.GetSVNRevision()
     namer = bot_utils.GCSNamer(internal=True)
+    # The version of gsutil we have on the bots is not new enough to support
+    # the acl set commands.
+    bot_utils.GSUtil.USE_DART_REPO_VERSION = True
     gsutil = bot_utils.GSUtil()
 
-
     # Archive dartuim
     local = os.path.join(options.build_products_dir, APK_LOCATION)
     # TODO(whesse): pass in arch and mode from reciepe
     remote = namer.dartium_android_apk_filepath(revision,
                                                 'dartium-android',
                                                 'arm',
                                                 'release')
     web_link_prefix = 'https://storage.cloud.google.com/'
     dartium_link = string.replace(remote, 'gs://', web_link_prefix)
     UploadSetACL(gsutil, local, remote)
@@ skipping 20 matching lines @@
 
   if not options.build_products_dir:
     print "No build products directory given."
     sys.exit(1)
 
   UploadAPKs(options)
   sys.exit(0)
 
 if __name__ == '__main__':
   main()