Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update setup_android.py

This commit is contained in:
deal 2022-01-28 20:17:28 +08:00 committed by GitHub
parent 9197472ef8
commit 04e5eeb112
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/unix-ci/setup_android.py
View File

@ -79,16 +79,6 @@ def download(url, zip_file):
else: else:
urllib.urlretrieve(url, zip_file) urllib.urlretrieve(url, zip_file)
@retry(Exception, tries=5, delay=1, backoff=1)
def install_android_ndk():
file_name = "android-ndk-" + NDK_VER + "-" + SYSTEM + "-x86_64.zip"
url = "https://dl.google.com/android/repository/" + file_name
zip_file = os.path.abspath(os.path.join(ROOT_DIR, file_name))
download(url, zip_file)
unzip(zip_file, ROOT_DIR)
@retry(Exception, tries=5, delay=1, backoff=1) @retry(Exception, tries=5, delay=1, backoff=1)
def install_android_cmdline_tools(): def install_android_cmdline_tools():
file_plat = platform.system().lower() file_plat = platform.system().lower()
@ -105,7 +95,7 @@ def install_android_cmdline_tools():
@retry(Exception, tries=5, delay=1, backoff=1) @retry(Exception, tries=5, delay=1, backoff=1)
def install_android_sdk(): def install_android_sdk():
# list packages # list packages
# run_with_yes(SDK_MANAGER + " --list --sdk_root=" + ANDROID_SDK) run_with_yes(SDK_MANAGER + " --list --sdk_root=" + ANDROID_SDK)
switches = " --verbose --sdk_root=" + ANDROID_SDK + " " switches = " --verbose --sdk_root=" + ANDROID_SDK + " "
cmd_base = SDK_MANAGER + switches cmd_base = SDK_MANAGER + switches
@ -137,10 +127,8 @@ def export_environment(ndk_only):
myfile.write("$env:ANDROID_NDK=\"" + ANDROID_NDK + "\"\n") myfile.write("$env:ANDROID_NDK=\"" + ANDROID_NDK + "\"\n")
def main(ndk_only): def main(ndk_only):
# if not ndk_only:
install_android_cmdline_tools() install_android_cmdline_tools()
install_android_sdk() install_android_sdk()
# install_android_ndk()
export_environment(ndk_only) export_environment(ndk_only)