Skip to content

Commit 51aeda7

Browse files
DmitriySalnikovdsnopek
authored andcommittedJan 22, 2024
[Scons] Set the minimum Android API level to 21
(cherry picked from commit 79d2a9c)
1 parent cd90415 commit 51aeda7

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed
 

‎tools/android.py

+3-5
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_NDK_ROOT",
@@ -35,11 +35,9 @@ def generate(env):
3535
my_spawn.configure(env)
3636

3737
# Validate API level
38-
api_level = int(env["android_api_level"])
39-
if "64" in env["arch"] and api_level < 21:
40-
print("WARN: 64-bit Android architectures require an API level of at least 21; setting android_api_level=21")
38+
if int(env["android_api_level"]) < 21:
39+
print("WARNING: minimum supported Android target api is 21. Forcing target api 21.")
4140
env["android_api_level"] = "21"
42-
api_level = 21
4341

4442
# Setup toolchain
4543
toolchain = env["ANDROID_NDK_ROOT"] + "/toolchains/llvm/prebuilt/"

0 commit comments

Comments
 (0)