godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unused code in android detect.py and SCsub 

(cherry picked from commit 90cdacd741)
This commit is contained in:
unknown 2020-03-18 18:12:50 +05:30 committed by Rémi Verschelde
parent 6e6db2d9cb
commit fcde11222a
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/android/SCsub
View File

@ -1,8 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
from detect import get_ndk_version
from distutils.version import LooseVersion
Import('env') Import('env')
android_files = [ android_files = [

5
platform/android/detect.py
View File

@ -164,7 +164,6 @@ def configure(env):
env.Tool('gcc') env.Tool('gcc')
env.use_windows_spawn_fix() env.use_windows_spawn_fix()
mt_link = True
if (sys.platform.startswith("linux")): if (sys.platform.startswith("linux")):
host_subpath = "linux-x86_64" host_subpath = "linux-x86_64"
elif (sys.platform.startswith("darwin")): elif (sys.platform.startswith("darwin")):
@ -173,12 +172,8 @@ def configure(env):
if (platform.machine().endswith('64')): if (platform.machine().endswith('64')):
host_subpath = "windows-x86_64" host_subpath = "windows-x86_64"
else: else:
mt_link = False
host_subpath = "windows" host_subpath = "windows"
if env["android_arch"] == "arm64v8":
mt_link = False
compiler_path = env["ANDROID_NDK_ROOT"] + "/toolchains/llvm/prebuilt/" + host_subpath + "/bin" 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 gcc_toolchain_path = env["ANDROID_NDK_ROOT"] + "/toolchains/" + target_subpath + "/prebuilt/" + host_subpath
tools_path = gcc_toolchain_path + "/" + abi_subpath + "/bin" tools_path = gcc_toolchain_path + "/" + abi_subpath + "/bin"