Merge "Check for the presence of the ANDROID_ABI variable" into main

This commit is contained in:
Vincent Rabaud 2024-03-07 08:54:42 +00:00 committed by Gerrit Code Review
commit e2922e4390

View File

@ -61,7 +61,7 @@ endif()
set(WEBP_SIMD_FILES_TO_INCLUDE) set(WEBP_SIMD_FILES_TO_INCLUDE)
set(WEBP_SIMD_FLAGS_TO_INCLUDE) set(WEBP_SIMD_FLAGS_TO_INCLUDE)
if(${ANDROID}) if(ANDROID AND ANDROID_ABI)
if(${ANDROID_ABI} STREQUAL "armeabi-v7a") if(${ANDROID_ABI} STREQUAL "armeabi-v7a")
# This is because Android studio uses the configuration "-march=armv7-a # This is because Android studio uses the configuration "-march=armv7-a
# -mfloat-abi=softfp -mfpu=vfpv3-d16" that does not trigger neon # -mfloat-abi=softfp -mfpu=vfpv3-d16" that does not trigger neon