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

tools/bots/bot_utils.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012, 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 hashlib
 import imp
 import os
 import subprocess
@@ skipping 192 matching lines @@
     print >> sys.stderr, "Failed to execute '%s'. Exit code: %s." % (
         command, p.returncode)
     print >> sys.stderr, "stdout: ", stdout
     print >> sys.stderr, "stderr: ", stderr
     raise Exception("Failed to execute %s." % command)
   return (stdout, stderr, p.returncode)
 
 class GSUtil(object):
   GSUTIL_IS_SHELL_SCRIPT = False
   GSUTIL_PATH = None
+  USE_DART_REPO_VERSION = False
 
   def _layzCalculateGSUtilPath(self):
     if not GSUtil.GSUTIL_PATH:
       buildbot_gsutil = utils.GetBuildbotGSUtilPath()
-      if os.path.isfile(buildbot_gsutil):
+      if os.path.isfile(buildbot_gsutil) and not GSUtil.USE_DART_REPO_VERSION:
         GSUtil.GSUTIL_IS_SHELL_SCRIPT = True
         GSUtil.GSUTIL_PATH = buildbot_gsutil
       else:
         dart_gsutil = os.path.join(DART_DIR, 'third_party', 'gsutil', 'gsutil')
         possible_locations = (list(os.environ['PATH'].split(os.pathsep))
             + [dart_gsutil])
         for directory in possible_locations:
           location = os.path.join(directory, 'gsutil')
           if os.path.isfile(location):
             GSUtil.GSUTIL_IS_SHELL_SCRIPT = False
@@ skipping 69 matching lines @@
   if not mangled_filename:
     mangled_filename = os.path.basename(filename)
 
   checksum = CalculateChecksum(filename)
   checksum_filename = '%s.md5sum' % filename
 
   with open(checksum_filename, 'w') as f:
     f.write('%s *%s' % (checksum, mangled_filename))
 
   return checksum_filename