diff options
Diffstat (limited to 'chromium/third_party/zlib/BUILD.gn')
| -rw-r--r-- | chromium/third_party/zlib/BUILD.gn | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn index 304c7a22df4..394402c57dd 100644 --- a/chromium/third_party/zlib/BUILD.gn +++ b/chromium/third_party/zlib/BUILD.gn @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/features.gni") import("//build/config/compiler/compiler.gni") import("//build/shim_headers.gni") @@ -115,7 +116,7 @@ if (use_arm_neon_optimizations) { # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: # "All implementations of the ARMv8.1 architecture are required to # implement the CRC32* instructions. These are optional in ARMv8.0." - if (!is_ios) { + if (!is_ios && !use_qt) { defines = [ "CRC32_ARMV8_CRC32" ] if (is_android) { defines += [ "ARMV8_OS_ANDROID" ] @@ -136,7 +137,7 @@ if (use_arm_neon_optimizations) { source_set("zlib_arm_crc32") { visibility = [ ":*" ] - if (!is_ios) { + if (!is_ios && !use_qt) { include_dirs = [ "." ] if (!is_win && !is_clang) { |