diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-18 14:42:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-18 14:42:57 +0100 |
| commit | 78ef4b707a1f02a0176d96e9cb2cb144e5fae041 (patch) | |
| tree | af072f59092c03ebf16e62a6df107cc7a8d95502 /platform/android | |
| parent | 70e12d86154bd3c681273890a177e3dabd113644 (diff) | |
| parent | 90cdacd7419b00cb24a6b55a414fbd1911226af0 (diff) | |
Merge pull request #37141 from Anutrix/remove_android_unused_pycode
Removed unused code in android detect.py and SCsub
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/SCsub | 3 | ||||
| -rw-r--r-- | platform/android/detect.py | 5 |
2 files changed, 0 insertions, 8 deletions
diff --git a/platform/android/SCsub b/platform/android/SCsub index 46f0703a65..5ca5ce548c 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 8f74ae0ef0..ff3ca0706c 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" |