Fixed building Android arm64-v8a architecture with NDK r18
authorSam Lantinga <slouken@libsdl.org>
Thu, 11 Oct 2018 21:54:44 -0700
changeset 595ed8961044eba
parent 594 693d8aff87d8
child 596 4b70bfe18fb7
Fixed building Android arm64-v8a architecture with NDK r18
external/libpng-1.6.32.patch
external/libpng-1.6.32/Android.mk
     1.1 --- a/external/libpng-1.6.32.patch	Mon Oct 01 20:27:51 2018 -0700
     1.2 +++ b/external/libpng-1.6.32.patch	Thu Oct 11 21:54:44 2018 -0700
     1.3 @@ -1,7 +1,7 @@
     1.4  diff -ruN libpng-1.6.32.orig/Android.mk libpng-1.6.32/Android.mk
     1.5  --- libpng-1.6.32.orig/Android.mk	1969-12-31 16:00:00.000000000 -0800
     1.6  +++ libpng-1.6.32/Android.mk	2018-10-01 20:26:46.000000000 -0700
     1.7 -@@ -0,0 +1,37 @@
     1.8 +@@ -0,0 +1,41 @@
     1.9  +LOCAL_PATH:= $(call my-dir)
    1.10  +
    1.11  +include $(CLEAR_VARS)
    1.12 @@ -19,6 +19,10 @@
    1.13  +common_SRC_FILES += \
    1.14  +	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
    1.15  +endif
    1.16 ++ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
    1.17 ++common_SRC_FILES += \
    1.18 ++	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
    1.19 ++endif
    1.20  +
    1.21  +common_CFLAGS := ## -fomit-frame-pointer
    1.22  +
     2.1 --- a/external/libpng-1.6.32/Android.mk	Mon Oct 01 20:27:51 2018 -0700
     2.2 +++ b/external/libpng-1.6.32/Android.mk	Thu Oct 11 21:54:44 2018 -0700
     2.3 @@ -15,6 +15,10 @@
     2.4  common_SRC_FILES += \
     2.5  	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
     2.6  endif
     2.7 +ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
     2.8 +common_SRC_FILES += \
     2.9 +	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
    2.10 +endif
    2.11  
    2.12  common_CFLAGS := ## -fomit-frame-pointer
    2.13