diff options
| author | Dan Albert <danalbert@google.com> | 2019-06-12 15:41:32 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2019-06-12 15:41:32 -0700 |
| commit | 4b57c562b7a11e8092cadbe8344640bcdeadd0de (patch) | |
| tree | 30b6ec269679a051de2a2b701bb7eec056c86a74 /build/tools | |
| parent | 06b0017c0f667c1a9f184797fb06460dbc47eaf8 (diff) | |
| download | ndk-4b57c562b7a11e8092cadbe8344640bcdeadd0de.tar.gz | |
Remove 32-bit Windows support from standalone toolchains.
Test: make_standalone_toolchain.py # On Windows
Bug: None
Change-Id: I8039dc5d23e61758805a5859944f67b4cb920309
Diffstat (limited to 'build/tools')
| -rwxr-xr-x | build/tools/make_standalone_toolchain.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py index cd6fa62dc..64f8df7d0 100755 --- a/build/tools/make_standalone_toolchain.py +++ b/build/tools/make_standalone_toolchain.py @@ -72,10 +72,7 @@ def get_host_tag_or_die(): elif sys.platform == 'darwin': return 'darwin-x86_64' elif sys.platform == 'win32' or sys.platform == 'cygwin': - host_tag = 'windows-x86_64' - if not os.path.exists(os.path.join(NDK_DIR, 'prebuilt', host_tag)): - host_tag = 'windows' - return host_tag + return 'windows-x86_64' sys.exit('Unsupported platform: ' + sys.platform) @@ -229,8 +226,8 @@ def create_toolchain(install_path, arch, api, toolchain_path, host_tag): """Create a standalone toolchain.""" copy_tree(toolchain_path, install_path) triple = get_triple(arch) - make_clang_scripts(install_path, arch, api, host_tag.startswith('windows')) - replace_gcc_wrappers(install_path, triple, host_tag.startswith('windows')) + make_clang_scripts(install_path, arch, api, host_tag == 'windows-x86_64') + replace_gcc_wrappers(install_path, triple, host_tag == 'windows-x86_64') prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag) copy_tree(prebuilt_path, install_path) @@ -243,7 +240,7 @@ def create_toolchain(install_path, arch, api, toolchain_path, host_tag): def warn_unnecessary(arch, api, host_tag): """Emits a warning that this script is no longer needed.""" - if host_tag.startswith('windows'): + if host_tag == 'windows-x86_64': ndk_var = '%NDK%' prompt = 'C:\\>' else: @@ -367,7 +364,7 @@ def main(): create_toolchain(install_path, args.arch, api, toolchain_path, host_tag) if args.install_dir is None: - if host_tag.startswith('windows'): + if host_tag == 'windows-x86_64': package_format = 'zip' else: package_format = 'bztar' |