[BUG] ANDROID_ARM_MODE behavior change between legacy and new toolchain file

[DanAlbert]

Description

Mirroring https://gitlab.kitware.com/cmake/cmake/-/issues/23108 for tracking purposes.

The legacy toolchain would ignore the -DANDROID_ARM_MODE argument if it was passed for any ABI other than armeabi-v7a. The new toolchain converts that to CMAKE_ANDROID_ARM_MODE, and CMake 3.22 emits an error if that is passed for ABIs other than armeabi-v7a. We should preserve the old behavior.

@hhb has already uploaded a fix for us (thanks!): https://android-review.googlesource.com/c/platform/ndk/+/1951676

Affected versions

r23, r24

Canary version

No response

Host OS

Linux, Mac, Windows

Host OS version

All

Affected ABIs

arm64-v8a, x86, x86_64

Build system

CMake

Other build system

No response

minSdkVersion

Any

Device API level

No response

[DanAlbert]

Should be fixed in r23 build 8486889.