commit f80f5a2d5ebcef95a6a5762e2145d784a9a8dffe
author Rico Wind <ricow@google.com> Fri Jun 16 09:15:57 2017 +0200
committer Rico Wind <ricow@google.com> Fri Jun 16 09:15:57 2017 +0200
tree 7a9b28db6346d70ed78bafcb53c5a6a92ff7551d
parent 91bfa0d246cfe70872aa60161fb00da4d8f2f412

Fix gradle initial dependency fetch on windows

R=jmhenaff@google.com, sgjesse@google.com

Bug:
Change-Id: I19ed128b61b1506279742b961fbce05cc57abcfb

tools/gradle.py

diff --git a/tools/gradle.py b/tools/gradle.py
index 64e6d51..f30b3f4 100755
--- a/tools/gradle.py
+++ b/tools/gradle.py
@@ -14,7 +14,7 @@
 
 GRADLE_DIR = os.path.join(utils.REPO_ROOT, 'third_party', 'gradle')
 GRADLE_SHA1 = os.path.join(GRADLE_DIR, 'gradle.tar.gz.sha1')
-if os.name == 'nt':
+if utils.IsWindows():
   GRADLE = os.path.join(GRADLE_DIR, 'gradle', 'bin', 'gradle.bat')
 else:
   GRADLE = os.path.join(GRADLE_DIR, 'gradle', 'bin', 'gradle')

tools/utils.py

diff --git a/tools/utils.py b/tools/utils.py
index 7379e16..8c4f710 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -14,7 +14,6 @@
 
 TOOLS_DIR = os.path.abspath(os.path.normpath(os.path.join(__file__, '..')))
 REPO_ROOT = os.path.realpath(os.path.join(TOOLS_DIR, '..'))
-DOWNLOAD_DEPS = os.path.join(REPO_ROOT, 'scripts', 'download-deps.sh')
 
 def PrintCmd(s):
   if type(s) is list:
@@ -23,8 +22,13 @@
   # I know this will hit os on windows eventually if we don't do this.
   sys.stdout.flush()
 
+def IsWindows():
+  return os.name == 'nt'
+
 def DownloadFromGoogleCloudStorage(sha1_file, bucket='r8-deps'):
-  cmd = ["download_from_google_storage", "-n", "-b", bucket, "-u", "-s",
+  suffix = '.bat' if IsWindows() else ''
+  download_script = 'download_from_google_storage%s' % suffix
+  cmd = [download_script, '-n', '-b', bucket, '-u', '-s',
          sha1_file]
   PrintCmd(cmd)
   subprocess.check_call(cmd)
@@ -64,11 +68,11 @@
 
  def __enter__(self):
    self._old_cwd = os.getcwd()
-   print "Enter directory = ", self._working_directory
+   print 'Enter directory = ', self._working_directory
    os.chdir(self._working_directory)
 
  def __exit__(self, *_):
-   print "Enter directory = ", self._old_cwd
+   print 'Enter directory = ', self._old_cwd
    os.chdir(self._old_cwd)
 
 # Reading Android CTS test_result.xml
@@ -105,5 +109,5 @@
       m = re_test.search(line)
       if m:
         outcome = m.groups()[0]
-        assert outcome in ["fail", "pass"]
+        assert outcome in ['fail', 'pass']
         yield CtsTest(m.groups()[1], outcome == 'pass')