Merge pull request #65161 from m4gr3d/fix_android_build_failures_on_windows_main

Fix build failures for Android on Windows
This commit is contained in:
Clay John 2022-08-31 15:57:21 -07:00 committed by GitHub
commit 7061adf24f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -412,16 +412,17 @@ def use_windows_spawn_fix(self, platform=None):
startupinfo = subprocess.STARTUPINFO()
startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
proc = subprocess.Popen(
cmdline,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
startupinfo=startupinfo,
shell=False,
env=env,
text=True,
)
popen_args = {
"stdin": subprocess.PIPE,
"stdout": subprocess.PIPE,
"stderr": subprocess.PIPE,
"startupinfo": startupinfo,
"shell": False,
"env": env,
}
if sys.version_info >= (3, 7, 0):
popen_args["text"] = True
proc = subprocess.Popen(cmdline, **popen_args)
_, err = proc.communicate()
rv = proc.wait()
if rv: