Remove 32-bit Windows from update scripts.

Test: ./update_binutils.py ...
Bug: None
Change-Id: I28a570d740e37fb6f142d8468f5ea29dcb869024

3 files changed, 7 insertions, 8 deletions

diff --git a/symlink-clang.py b/symlink-clang.py
index dbca0eec0..9c4b11232 100755
--- a/symlink-clang.py
+++ b/symlink-clang.py
@@ -121,7 +121,7 @@ def main():
         subprocess.check_call(
             ['repo', 'start', 'update-clang-{}'.format(build), '.'])
 
-    hosts = ('darwin-x86_64', 'linux-x86_64', 'windows', 'windows-x86_64')
+    hosts = ('darwin-x86_64', 'linux-x86_64', 'windows-x86_64')
     for host in hosts:
         install_path = build_support.android_path(
             'prebuilts/ndk/current/toolchains', host, 'llvm')
diff --git a/update_binutils.py b/update_binutils.py
index 2d7c765d0..79c614178 100755
--- a/update_binutils.py
+++ b/update_binutils.py
@@ -150,7 +150,7 @@ def main():
         check_call(
             ['repo', 'start', 'update-binutils-{}'.format(args.build), '.'])
 
-    hosts = ('darwin', 'linux', 'win', 'win64')
+    hosts = ('darwin', 'linux', 'win64')
     packages = []
     for host in hosts:
         for arch in ndk.abis.ALL_ARCHITECTURES:
diff --git a/update_gcc.py b/update_gcc.py
index 16eeedfaa..7016b4f66 100755
--- a/update_gcc.py
+++ b/update_gcc.py
@@ -88,15 +88,14 @@ def build_name(host, arch):
     >>> build_name('darwin-x86_64', 'arm')
     'arm'
 
-    >>> build_name('windows', 'x86')
-    'win_x86'
+    >>> build_name('windows-x86_64', 'x86')
+    'win64_x86'
     """
     if host == 'darwin-x86_64':
         return arch + '_mac'
 
     return {
         'linux-x86_64': 'linux',
-        'windows': 'win',
         'windows-x86_64': 'win64',
     }[host] + '_' + arch
 
@@ -107,8 +106,8 @@ def package_name(host, arch):
     >>> package_name('linux-x86_64', 'arm')
     'gcc-arm-linux-x86_64.tar.bz2'
 
-    >>> package_name('windows', 'x86')
-    'gcc-x86-windows.tar.bz2'
+    >>> package_name('windows-x86_64', 'x86')
+    'gcc-x86-windows-x86_64.tar.bz2'
     """
     return 'gcc-{}-{}.tar.bz2'.format(arch, host)
 
@@ -152,7 +151,7 @@ def main():
     if not args.use_current_branch:
         check_call(['repo', 'start', 'update-gcc-{}'.format(args.build), '.'])
 
-    hosts = ('darwin-x86_64', 'linux-x86_64', 'windows', 'windows-x86_64')
+    hosts = ('darwin-x86_64', 'linux-x86_64', 'windows-x86_64')
     packages = []
     for host in hosts:
         for arch in build_support.ALL_ARCHITECTURES: