diff options
| author | Aaron Franke <arnfranke@yahoo.com> | 2021-12-15 17:38:10 -0800 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-08-25 11:19:20 +0200 |
| commit | 27b0f182758db5d2d4c123c81430c34941161b39 (patch) | |
| tree | 1182408f0be3567400ff08ace5b4d48b40815641 /platform/android/SCsub | |
| parent | 8916949b5051080e48d21e986eb5d77de67a882d (diff) | |
Unify bits, arch, and android_arch into env["arch"]
Fully removes the `bits` option and adapts the code that relied on it.
Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
Diffstat (limited to 'platform/android/SCsub')
| -rw-r--r-- | platform/android/SCsub | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/SCsub b/platform/android/SCsub index d370a4d18d..344ca036de 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -41,13 +41,13 @@ lib = env_android.add_shared_library("#bin/libgodot", [android_objects], SHLIBSU env.Depends(lib, thirdparty_obj) lib_arch_dir = "" -if env["android_arch"] == "armv7": +if env["arch"] == "arm32": lib_arch_dir = "armeabi-v7a" -elif env["android_arch"] == "arm64v8": +elif env["arch"] == "arm64": lib_arch_dir = "arm64-v8a" -elif env["android_arch"] == "x86": +elif env["arch"] == "x86_32": lib_arch_dir = "x86" -elif env["android_arch"] == "x86_64": +elif env["arch"] == "x86_64": lib_arch_dir = "x86_64" else: print("WARN: Architecture not suitable for embedding into APK; keeping .so at \\bin") |