Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2026-09-13 05:42:51 -05:00 · 2020-06-19 07:33:50 +00:00
parent 9ba5581d17 cb54f4c2ec
commit e3d502310f
11 changed files with 186 additions and 86 deletions
--- a/platforms/android/build_sdk.py
+++ b/platforms/android/build_sdk.py
@@ -59,6 +59,8 @@ def check_executable(cmd):
    try:
        log.debug("Executing: %s" % cmd)
        result = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+        if not isinstance(result, str):
+            result = result.decode("utf-8")
        log.debug("Result: %s" % (result+'\n').split('\n')[0])
        return True
    except Exception as e: