diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-11-22 22:56:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-22 22:56:44 +0100 |
| commit | 32409472b785fd6f9062300664fa55b46bfd07e7 (patch) | |
| tree | b807bd1f8a2a9856c2c983d9538c031eebf0a9ec | |
| parent | d0fdc3adf30eb0db83e89e463403c3785bd3efa4 (diff) | |
| parent | 79d2a9c4563cb768f508cc3f791c66c7cc57d379 (diff) | |
| download | redot-cpp-32409472b785fd6f9062300664fa55b46bfd07e7.tar.gz | |
Merge pull request #1318 from DmitriySalnikov/android_api_version
[Scons] Set the minimum Android API level to 21
| -rw-r--r-- | tools/android.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/android.py b/tools/android.py index 479ee15..bee58c4 100644 --- a/tools/android.py +++ b/tools/android.py @@ -8,7 +8,7 @@ def options(opts): opts.Add( "android_api_level", "Target Android API level", - "18" if "32" in ARGUMENTS.get("arch", "arm64") else "21", + "21", ) opts.Add( "ANDROID_HOME", @@ -47,11 +47,9 @@ def generate(env): my_spawn.configure(env) # Validate API level - api_level = int(env["android_api_level"]) - if "64" in env["arch"] and api_level < 21: - print("WARN: 64-bit Android architectures require an API level of at least 21; setting android_api_level=21") + if int(env["android_api_level"]) < 21: + print("WARNING: minimum supported Android target api is 21. Forcing target api 21.") env["android_api_level"] = "21" - api_level = 21 # Setup toolchain toolchain = get_android_ndk_root(env) + "/toolchains/llvm/prebuilt/" |