[android_compat_fixes] fixed issues with running Android project generation scripts on Unix systems

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
This commit is contained in:
AMZN-ScottR
2021-11-08 12:25:10 -08:00
parent aabbf51d3a
commit c0dd9ac26b
2 changed files with 11 additions and 8 deletions
@@ -621,7 +621,7 @@ class AndroidProjectGenerator(object):
gradle_wrapper_cmd.extend(['wrapper', '-p', str(self.build_dir.resolve())])
proc_result = subprocess.run(gradle_wrapper_cmd,
shell=True)
shell=(platform.system() == 'Windows'))
if proc_result.returncode != 0:
raise common.LmbrCmdError("Gradle was unable to generate a gradle wrapper for this project (code {}): {}"
.format(proc_result.returncode, proc_result.stderr or ""),
@@ -1579,9 +1579,6 @@ class AndroidSDKResolver(object):
ext = ''
if platform.system() == 'Windows':
ext = '.bat'
else:
raise common.LmbrCmdError(f"This tool is not supported on the current platform {platform.system()}")
self.sdk_manager_path = tools_path / 'bin' / f'sdkmanager{ext}'
if not self.sdk_manager_path.is_file():