summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2020-08-28 08:44:52 +0200
committerMichal Klocek <michal.klocek@qt.io>2020-08-31 09:31:41 +0000
commite31cc67a44d8af96578680f51d2a7b2f4a5b1279 (patch)
treed0bbbcfc9a66745ec95ce3d91be1c6233857e4f6
parent4e0b66a6f2d6901b4c738c8bcfb9d89d74def602 (diff)
downloadqtwebengine-chromium-e31cc67a44d8af96578680f51d2a7b2f4a5b1279.tar.gz
Fix neon support in libpng
Set explicitly PNG_ARM_NEON_OPT for arm in gn. This fixes fat library on iOS. Change-Id: I8f46d9e4915d990d3fa79a33b733ef1fa17b2afe Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/third_party/libpng/BUILD.gn6
1 files changed, 6 insertions, 0 deletions
diff --git a/chromium/third_party/libpng/BUILD.gn b/chromium/third_party/libpng/BUILD.gn
index cbdb867f2a0..7f016808e32 100644
--- a/chromium/third_party/libpng/BUILD.gn
+++ b/chromium/third_party/libpng/BUILD.gn
@@ -95,6 +95,12 @@ source_set("libpng_sources") {
]
}
+ if ((current_cpu == "arm" || current_cpu == "arm64") && !arm_use_neon) {
+ defines += [
+ "PNG_ARM_NEON_OPT=0"
+ ]
+ }
+
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]