aboutsummaryrefslogtreecommitdiff
path: root/sources
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2019-06-12 13:58:44 -0700
committerDan Albert <danalbert@google.com>2019-06-12 14:04:57 -0700
commitfc0143e6d6e1c7a03ace1939185ae893b0480047 (patch)
tree5cd6c236f15eb98412756b0b0febd8855cc4d495 /sources
parentb949e2ac60619bf7d2a37f3d2c2a5f9ab679a05e (diff)
downloadndk-fc0143e6d6e1c7a03ace1939185ae893b0480047.tar.gz
Remove support for 32-bit Windows.
The emulator drops this next month, and Studio is following next year. Test: ./checkbuild.py --system windows64 Bug: None Change-Id: I653f31a881d9358fc8b49878b839c6ed8a75c450
Diffstat (limited to 'sources')
-rwxr-xr-xsources/host-tools/make-3.81/build.py5
-rwxr-xr-xsources/host-tools/toolbox/build.py12
2 files changed, 6 insertions, 11 deletions
diff --git a/sources/host-tools/make-3.81/build.py b/sources/host-tools/make-3.81/build.py
index f94c4bfab..17178fba1 100755
--- a/sources/host-tools/make-3.81/build.py
+++ b/sources/host-tools/make-3.81/build.py
@@ -31,15 +31,12 @@ from ndk.hosts import Host
def main(args):
build_cmd = [
- 'bash', 'build-make.sh',
+ 'bash', 'build-make.sh', '--try-64',
]
if args.host.is_windows:
build_cmd.append('--mingw')
- if args.host != Host.Windows:
- build_cmd.append('--try-64')
-
build_cmd.append('--build-dir=' + os.path.join(args.out_dir, 'make'))
build_support.build(build_cmd, args, intermediate_package=True)
diff --git a/sources/host-tools/toolbox/build.py b/sources/host-tools/toolbox/build.py
index fa5b6c573..6d34955eb 100755
--- a/sources/host-tools/toolbox/build.py
+++ b/sources/host-tools/toolbox/build.py
@@ -37,15 +37,13 @@ def main(args):
if not args.host.is_windows:
sys.exit('Toolbox is only for Windows hosts.')
+ toolbox_src = os.path.join(args.out_dir, 'toolbox')
build_cmd = [
- 'bash', 'build-toolbox.sh',
+ 'bash',
+ 'build-toolbox.sh',
+ '--try-64',
+ f'--build-dir={toolbox_src}',
]
-
- if args.host != Host.Windows:
- build_cmd.append('--try-64')
-
- build_cmd.append('--build-dir=' + os.path.join(args.out_dir, 'toolbox'))
-
build_support.build(build_cmd, args, intermediate_package=True)