From 2f5fb0b76131828352d7887e90da50648e07bfe8 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 12 Aug 2017 12:27:53 -0700 Subject: [PATCH] Fixed bug 3108 - JPEG Assembly using Android API 21 Isaac Burns Starting with API 21 (android-21), __ARCH_ARM__ < 6 is no longer defined in platforms/android-21/arch-arm/usr/include/machine/cpu-features.h. Compiling the JPEG library for armeabi errors with: "error Unknown or unsupported ARM architecture". There may be a better way to patch this in the SDL_image/Android.mk file. ifneq (,$(filter $(TARGET_ARCH_ABI),armeabi-v7a arm64-v8a)) LOCAL_SRC_FILES += $(JPG_LIBRARY_PATH)/jidctfst.S else LOCAL_SRC_FILES += $(JPG_LIBRARY_PATH)/jidctfst.c endif Somewhat related to Bug #2501. --- Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 97a96c7d..d1b2e602 100644 --- a/Android.mk +++ b/Android.mk @@ -86,8 +86,8 @@ ifeq ($(SUPPORT_JPG),true) $(JPG_LIBRARY_PATH)/jmemmgr.c \ $(JPG_LIBRARY_PATH)/jmem-android.c - # assembler support is available for arm - ifeq ($(TARGET_ARCH),arm) + # starting with android-21, assembler support is available for armeabi-v7a + ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) LOCAL_SRC_FILES += $(JPG_LIBRARY_PATH)/jidctfst.S else LOCAL_SRC_FILES += $(JPG_LIBRARY_PATH)/jidctfst.c