summaryrefslogtreecommitdiffstats
path: root/external
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2019-11-01 17:56:01 +0100
committerMichael Meeks <michael.meeks@collabora.com>2020-05-16 19:19:42 +0100
commit6fffa2d6ee64fce95fac204eb6d6db0f0cefc75d (patch)
tree216c05a5cc9f7cfe2c47a0073d8faa96d26ee70c /external
parenttdf#127878: Use a larger "morebutton" image on iOS (diff)
downloadcore-6fffa2d6ee64fce95fac204eb6d6db0f0cefc75d.tar.gz
core-6fffa2d6ee64fce95fac204eb6d6db0f0cefc75d.zip
android: Add also aarch64 to avoid linking errors.
Change-Id: Ifdd696dc37de541bc722807054cd4ba7b862c175 Reviewed-on: https://gerrit.libreoffice.org/81904 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 620f39b816e3f10a4e047bb4f5ed5f4fdad2b364) Reviewed-on: https://gerrit.libreoffice.org/81914
Diffstat (limited to 'external')
-rw-r--r--external/libpng/StaticLibrary_libpng.mk2
1 files changed, 1 insertions, 1 deletions
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 \