Skip to content

Commit ab2a9c6

Browse files
committed
Android: fix compilation libpng-1.6.37 (missing arm/palette_neon_intrinsics.c)
undefined reference to `png_riffle_palette_neon' undefined reference to `png_do_expand_palette_rgba8_neon' undefined reference to `png_do_expand_palette_rgb8_neon'
1 parent 866a053 commit ab2a9c6

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

external/libpng-1.6.37.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ diff -ruN libpng-1.6.37.orig/Android.mk libpng-1.6.37/Android.mk
1313
+
1414
+ifeq ($(TARGET_ARCH_ABI),armeabi)
1515
+common_SRC_FILES += \
16-
+ arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
16+
+ arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
1717
+endif
1818
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
1919
+common_SRC_FILES += \
20-
+ arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
20+
+ arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
2121
+endif
2222
+ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
2323
+common_SRC_FILES += \
24-
+ arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
24+
+ arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
2525
+endif
2626
+
2727
+common_CFLAGS := ## -fomit-frame-pointer

external/libpng-1.6.37/Android.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ common_SRC_FILES := \
99

1010
ifeq ($(TARGET_ARCH_ABI),armeabi)
1111
common_SRC_FILES += \
12-
arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
12+
arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
1313
endif
1414
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
1515
common_SRC_FILES += \
16-
arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
16+
arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
1717
endif
1818
ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
1919
common_SRC_FILES += \
20-
arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
20+
arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
2121
endif
2222

2323
common_CFLAGS := ## -fomit-frame-pointer

0 commit comments

Comments
 (0)