[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - external/libpng

[Jan Holesovsky (via logerrit)]

 external/libpng/StaticLibrary_libpng.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 620f39b816e3f10a4e047bb4f5ed5f4fdad2b364
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Nov 1 17:56:01 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Dec 2 09:08:30 2019 +0100

    android: Add also aarch64 to avoid linking errors.
    
    Change-Id: Ifdd696dc37de541bc722807054cd4ba7b862c175
    Reviewed-on: https://gerrit.libreoffice.org/81904
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/external/libpng/StaticLibrary_libpng.mk b/external/libpng/StaticLibrary_libpng.mk
index f43a462c7935..0fb2a6b2a7df 100644
--- a/external/libpng/StaticLibrary_libpng.mk
+++ b/external/libpng/StaticLibrary_libpng.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\
 	UnpackedTarball/libpng/pngwrite \
 	UnpackedTarball/libpng/pngwtran \
 	UnpackedTarball/libpng/pngwutil \
-	$(if $(filter ARM ARM64,$(CPUNAME)),\
+	$(if $(filter ARM AARCH64 ARM64,$(CPUNAME)),\
 	    UnpackedTarball/libpng/arm/arm_init \
 	    UnpackedTarball/libpng/arm/filter_neon_intrinsics \
 	    UnpackedTarball/libpng/arm/palette_neon_intrinsics \