diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-25 19:29:18 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-25 19:29:18 +0100 |
| commit | 47bd51e70be775294250a1b3a360d67d1d7cd04e (patch) | |
| tree | 33725d885ef992fdf2258bc78b738be92a6960ce | |
| parent | ead82feb24be9d0075721a36ccaf98db9523c526 (diff) | |
| parent | 2a36127e342828d3f21539f1a21f3769405adff1 (diff) | |
Merge pull request #69172 from akien-mga/android-no-extra-extra-suffix
Android: Remove extra arch suffix now redundant with the default one
| -rw-r--r-- | platform/android/detect.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index 6eb8ba34ed..57a8d34d0e 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -101,16 +101,12 @@ def configure(env: "Environment"): if env["arch"] == "arm32": target_triple = "armv7a-linux-androideabi" - env.extra_suffix = ".armv7" + env.extra_suffix elif env["arch"] == "arm64": target_triple = "aarch64-linux-android" - env.extra_suffix = ".armv8" + env.extra_suffix elif env["arch"] == "x86_32": target_triple = "i686-linux-android" - env.extra_suffix = ".x86" + env.extra_suffix elif env["arch"] == "x86_64": target_triple = "x86_64-linux-android" - env.extra_suffix = ".x86_64" + env.extra_suffix target_option = ["-target", target_triple + str(get_min_sdk_version(env["ndk_platform"]))] env.Append(ASFLAGS=[target_option, "-c"]) |