Skip to content

Commit 79d2a9c

Browse files
[Scons] Set the minimum Android API level to 21
1 parent 6fd4e15 commit 79d2a9c

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

tools/android.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def options(opts):
88
opts.Add(
99
"android_api_level",
1010
"Target Android API level",
11-
"18" if "32" in ARGUMENTS.get("arch", "arm64") else "21",
11+
"21",
1212
)
1313
opts.Add(
1414
"ANDROID_HOME",
@@ -47,11 +47,9 @@ def generate(env):
4747
my_spawn.configure(env)
4848

4949
# Validate API level
50-
api_level = int(env["android_api_level"])
51-
if "64" in env["arch"] and api_level < 21:
52-
print("WARN: 64-bit Android architectures require an API level of at least 21; setting android_api_level=21")
50+
if int(env["android_api_level"]) < 21:
51+
print("WARNING: minimum supported Android target api is 21. Forcing target api 21.")
5352
env["android_api_level"] = "21"
54-
api_level = 21
5553

5654
# Setup toolchain
5755
toolchain = get_android_ndk_root(env) + "/toolchains/llvm/prebuilt/"

0 commit comments

Comments
 (0)