Merge pull request #27317 from asmorkalov:as/disable_ipp_x86_android

Disable IPP for x86 32bit Android as it's incompatible with modern NDK.
This commit is contained in:
Alexander Smorkalov 2025-05-16 12:16:16 +03:00 committed by GitHub
commit 80a8c97dd7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View File

@ -138,7 +138,7 @@ class ABI:
def __str__(self):
return "%s (%s)" % (self.name, self.toolchain)
def haveIPP(self):
return self.name == "x86" or self.name == "x86_64"
return self.name == "x86_64"
def haveKleidiCV(self):
return self.name == "arm64-v8a"

View File

@ -2,5 +2,5 @@ ABIs = [
ABI("2", "armeabi-v7a", None, 21, cmake_vars=dict(ANDROID_ABI='armeabi-v7a with NEON')),
ABI("3", "arm64-v8a", None, 21, cmake_vars=dict(ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES='ON')),
ABI("5", "x86_64", None, 21, cmake_vars=dict(ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES='ON')),
ABI("4", "x86", None, 21),
ABI("4", "x86", None, 21, cmake_vars=dict(WITH_IPP='OFF')),
]