From fcde11222ac4d44654a1cd6cdb94ab2bdff3be4b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Mar 2020 18:12:50 +0530 Subject: [PATCH] Removed unused code in android detect.py and SCsub (cherry picked from commit 90cdacd7419b00cb24a6b55a414fbd1911226af0) --- platform/android/SCsub | 3 --- platform/android/detect.py | 5 ----- 2 files changed, 8 deletions(-) diff --git a/platform/android/SCsub b/platform/android/SCsub index 7e186a811de..b0e41d2aa53 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -1,8 +1,5 @@ #!/usr/bin/env python -from detect import get_ndk_version -from distutils.version import LooseVersion - Import('env') android_files = [ diff --git a/platform/android/detect.py b/platform/android/detect.py index 8f74ae0ef09..ff3ca0706c9 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -164,7 +164,6 @@ def configure(env): env.Tool('gcc') env.use_windows_spawn_fix() - mt_link = True if (sys.platform.startswith("linux")): host_subpath = "linux-x86_64" elif (sys.platform.startswith("darwin")): @@ -173,12 +172,8 @@ def configure(env): if (platform.machine().endswith('64')): host_subpath = "windows-x86_64" else: - mt_link = False host_subpath = "windows" - if env["android_arch"] == "arm64v8": - mt_link = False - compiler_path = env["ANDROID_NDK_ROOT"] + "/toolchains/llvm/prebuilt/" + host_subpath + "/bin" gcc_toolchain_path = env["ANDROID_NDK_ROOT"] + "/toolchains/" + target_subpath + "/prebuilt/" + host_subpath tools_path = gcc_toolchain_path + "/" + abi_subpath + "/bin"