aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde2016-05-19 10:44:18 +0200
committerRémi Verschelde2016-06-04 22:20:02 +0200
commit01bdfa4d22581d3977f00a8b3e65367cc2767ca3 (patch)
tree0dd585871b7fd7aa79f3afdd3c4dcb3c8071ca23
parent16d38b199a2a3b4ca74bd7acab3ad426218353ff (diff)
downloadgodot-01bdfa4d22581d3977f00a8b3e65367cc2767ca3.tar.gz
godot-01bdfa4d22581d3977f00a8b3e65367cc2767ca3.tar.zst
godot-01bdfa4d22581d3977f00a8b3e65367cc2767ca3.zip
Android buildsystem: Drop obsolete NDK_TOOLCHAIN argument
It was a duplicate of NDK_TARGET, and not used for anything. (cherry picked from commit 5e0f0a962adddfc85957400b007b6b0c08160057)
-rw-r--r--platform/android/detect.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 7d7fd174e..11b14eb98 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -21,7 +21,6 @@ def get_opts():
return [
('ANDROID_NDK_ROOT', 'the path to Android NDK', os.environ.get("ANDROID_NDK_ROOT", 0)),
- ('NDK_TOOLCHAIN', 'toolchain to use for the NDK',"arm-eabi-4.4.0"),
('NDK_TARGET', 'toolchain to use for the NDK',os.environ.get("NDK_TARGET", "arm-linux-androideabi-4.9")),
('NDK_TARGET_X86', 'toolchain to use for the NDK x86',os.environ.get("NDK_TARGET_X86", "x86-4.9")),
('ndk_platform', 'compile for platform: (android-<api> , example: android-15)',"android-15"),