From f51a9d4caad35d4ba6df1bcf0a09cad495e752aa Mon Sep 17 00:00:00 2001
From: Erwin Jansen <jansene@google.com>
Date: Fri, 1 Apr 2022 12:20:49 -0700
Subject: Python 3 fixes for build system

This makes sure that we can run the scripts under python3 and 2.

It will disable the qemu validation on python3. The qemu build scripts
do not work with python 3.

Bug: 227774529
Bug: 227780975
Change-Id: I565f1a0678a1efc5bcd527d4d3daa01cc85f4f8a
---
 servers/build_tools.py   | 18 +++++++++++++-----
 servers/qemu_builder.py  |  1 +
 servers/server_config.py |  2 --
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/servers/build_tools.py b/servers/build_tools.py
index cc9be8e..3e48477 100755
--- a/servers/build_tools.py
+++ b/servers/build_tools.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2018 - The Android Open Source Project
 #
@@ -25,7 +25,11 @@ import socket
 import sys
 
 
-if sys.version_info[0] == 3:
+def is_python3():
+    return sys.version_info[0] == 3
+
+
+if is_python3():
     from queue import Queue
 else:
     from Queue import Queue
@@ -66,12 +70,16 @@ class LogBelowLevel(logging.Filter):
 
 def config_logging():
     logging_handler_out = logging.StreamHandler(sys.stdout)
-    logging_handler_out.setFormatter(TimeFormatter("%(asctime)s %(threadName)s | %(message)s"))
+    logging_handler_out.setFormatter(
+        TimeFormatter("%(asctime)s %(threadName)s | %(message)s")
+    )
     logging_handler_out.setLevel(logging.DEBUG)
     logging_handler_out.addFilter(LogBelowLevel(logging.WARNING))
 
     logging_handler_err = logging.StreamHandler(sys.stderr)
-    logging_handler_err.setFormatter(TimeFormatter("%(asctime)s %(threadName)s | %(message)s"))
+    logging_handler_err.setFormatter(
+        TimeFormatter("%(asctime)s %(threadName)s | %(message)s")
+    )
     logging_handler_err.setLevel(logging.WARNING)
 
     logging.root = logging.getLogger("build")
@@ -245,7 +253,7 @@ def main(argv):
         if args.generate:
             bld.generate()
             return
-        elif not target.startswith("darwin"):
+        elif not target.startswith("darwin") and not is_python3():
             bld.validate()
         else:
             logging.info("Not validating QEMU build.")
diff --git a/servers/qemu_builder.py b/servers/qemu_builder.py
index 33d3aee..6e3f61f 100644
--- a/servers/qemu_builder.py
+++ b/servers/qemu_builder.py
@@ -74,6 +74,7 @@ class QemuBuilder(object):
                 "--build-dir={}".format(self.out),
                 "--host={}".format(self.host),
                 "--verbose",
+                "--verbose",
             ],
             self.env,
             "qemu",
diff --git a/servers/server_config.py b/servers/server_config.py
index 65b2b8d..02401fc 100644
--- a/servers/server_config.py
+++ b/servers/server_config.py
@@ -1,4 +1,3 @@
-
 #!/usr/bin/env python
 #
 # Copyright 2021 - The Android Open Source Project
@@ -16,7 +15,6 @@
 # limitations under the License.
 
 
-
 import itertools
 import logging
 import os
-- 
cgit v1.2.3