소스 검색

Removed unused code in android detect.py and SCsub

(cherry picked from commit 90cdacd7419b00cb24a6b55a414fbd1911226af0)
unknown 5 년 전
부모
커밋
fcde11222a
2개의 변경된 파일0개의 추가작업 그리고 8개의 파일을 삭제
  1. 0 3
      platform/android/SCsub
  2. 0 5
      platform/android/detect.py

+ 0 - 3
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 = [

+ 0 - 5
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"