From 9feea0f5816a2f8a6a6cd484a83645d854e7477e Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Fri, 1 Nov 2019 17:56:01 +0100 Subject: android: Add also aarch64 to avoid linking errors. Change-Id: Ifdd696dc37de541bc722807054cd4ba7b862c175 Reviewed-on: https://gerrit.libreoffice.org/81904 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky (cherry picked from commit 620f39b816e3f10a4e047bb4f5ed5f4fdad2b364) Reviewed-on: https://gerrit.libreoffice.org/81914 --- external/libpng/StaticLibrary_libpng.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'external') diff --git a/external/libpng/StaticLibrary_libpng.mk b/external/libpng/StaticLibrary_libpng.mk index cb8428ec4dae..fe2364141b3b 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 \ -- cgit n>