diff options
| author | Juan Linietsky | 2016-05-21 22:34:55 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-05-21 22:34:55 -0300 |
| commit | eacb8f04c4697b8123afeec03088eebb3c4b20bd (patch) | |
| tree | 8070f7807ec5d6a375df7184b151abbee8790608 /platform/android | |
| parent | a75f8963380a1f6ae8501f21a1d3f3bef8a89d91 (diff) | |
| parent | 4c4d79e3c98182faf348f41f98d1cc3e5d843e69 (diff) | |
| download | godot-eacb8f04c4697b8123afeec03088eebb3c4b20bd.tar.gz godot-eacb8f04c4697b8123afeec03088eebb3c4b20bd.tar.zst godot-eacb8f04c4697b8123afeec03088eebb3c4b20bd.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/detect.py | 1 | ||||
| -rw-r--r-- | platform/android/globals/global_defaults.h | 2 |
2 files changed, 1 insertions, 2 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"), diff --git a/platform/android/globals/global_defaults.h b/platform/android/globals/global_defaults.h index 64eb26c48..11617ddfd 100644 --- a/platform/android/globals/global_defaults.h +++ b/platform/android/globals/global_defaults.h @@ -1,3 +1,3 @@ -void register_android_global_defaults();
\ No newline at end of file +void register_android_global_defaults(); |