Replace stringly typed hosts with an enum.

Test: nose2 ndk
Test: ./checkbuild.py && ./run_tests.py
Test: ./checkbuild.py --system windows
Test: ./checkbuild.py --system windows64
Bug: None
Change-Id: I339812db442eeb275498a777cd76bd1bb4ace846

2 files changed, 15 insertions, 6 deletions

diff --git a/sources/host-tools/make-3.81/build.py b/sources/host-tools/make-3.81/build.py
index afe4d27d6..f94c4bfab 100755
--- a/sources/host-tools/make-3.81/build.py
+++ b/sources/host-tools/make-3.81/build.py
@@ -21,8 +21,12 @@ import os
 import site
 
 site.addsitedir(os.path.join(os.path.dirname(__file__), '../../../build/lib'))
+site.addsitedir(os.path.join(os.path.dirname(__file__), '../../..'))
 
-import build_support  # pylint: disable=import-error
+# pylint: disable=import-error,wrong-import-position
+import build_support
+from ndk.hosts import Host
+# pylint: enable=import-error,wrong-import-position
 
 
 def main(args):
@@ -30,10 +34,10 @@ def main(args):
         'bash', 'build-make.sh',
     ]
 
-    if args.host in ('windows', 'windows64'):
+    if args.host.is_windows:
         build_cmd.append('--mingw')
 
-    if args.host != 'windows':
+    if args.host != Host.Windows:
         build_cmd.append('--try-64')
 
     build_cmd.append('--build-dir=' + os.path.join(args.out_dir, 'make'))
diff --git a/sources/host-tools/toolbox/build.py b/sources/host-tools/toolbox/build.py
index ad2127c38..fa5b6c573 100755
--- a/sources/host-tools/toolbox/build.py
+++ b/sources/host-tools/toolbox/build.py
@@ -25,24 +25,29 @@ import site
 import sys
 
 site.addsitedir(os.path.join(os.path.dirname(__file__), '../../../build/lib'))
+site.addsitedir(os.path.join(os.path.dirname(__file__), '../../..'))
 
-import build_support  # pylint: disable=import-error
+# pylint: disable=import-error,wrong-import-position
+import build_support
+from ndk.hosts import Host
+# pylint: enable=import-error,wrong-import-position
 
 
 def main(args):
-    if args.host not in ('windows', 'windows64'):
+    if not args.host.is_windows:
         sys.exit('Toolbox is only for Windows hosts.')
 
     build_cmd = [
         'bash', 'build-toolbox.sh',
     ]
 
-    if args.host != 'windows':
+    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)
 
+
 if __name__ == '__main__':
     build_support.run(main)