Merge branch 'android-ndk-legacy-toolchain' into release-3.25

Merge-request: !8170

Modules/Compiler/Clang.cmake

@@ -80,7 +80,7 @@ else()
       set(CMAKE_${lang}_COMPILE_OPTIONS_IPO "-flto")
     endif()
 
-    if(ANDROID AND CMAKE_ANDROID_NDK_VERSION VERSION_LESS "22")
+    if(ANDROID AND NOT CMAKE_ANDROID_NDK_VERSION VERSION_GREATER_EQUAL "22")
       # https://github.com/android-ndk/ndk/issues/242
       set(CMAKE_${lang}_LINK_OPTIONS_IPO "-fuse-ld=gold")
     endif()

Modules/Platform/Android.cmake

@@ -39,6 +39,8 @@ endif()
 # Commonly used Android toolchain files that pre-date CMake upstream support
 # set CMAKE_SYSTEM_VERSION to 1.  Avoid interfering with them.
 if(CMAKE_SYSTEM_VERSION EQUAL 1)
+  # The NDK legacy toolchain file provides its version number.
+  set(CMAKE_ANDROID_NDK_VERSION ${ANDROID_NDK_MAJOR}.${ANDROID_NDK_MINOR})
   return()
 endif()