diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-11-14 15:07:09 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-20 13:50:54 +0100 |
| commit | 0845613aa36b821bb0285be1c9aab7de2e6aaab5 (patch) | |
| tree | ce98b7ba4596aefc232b77c45169c88c7ba04224 | |
| parent | 5b448471ea7173afd44dcd98ed8e9a60cf42968f (diff) | |
| download | qtwebengine-chromium-0845613aa36b821bb0285be1c9aab7de2e6aaab5.tar.gz | |
Fixing zlib thumb issues
Fixes builing zlib without thump.
Also fixes bogus check for thumb in zlib
Change-Id: I5548b5a8ae351ae872e02441d869b3cd7bc5d426
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | chromium/third_party/zlib/BUILD.gn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn index 195b1aec0a7..4ce58c7a860 100644 --- a/chromium/third_party/zlib/BUILD.gn +++ b/chromium/third_party/zlib/BUILD.gn @@ -278,7 +278,7 @@ static_library("bundled_zlib") { sources -= [ "inflate.c" ] } - if (current_cpu == "arm" || current_cpu == "arm64") { + if ((current_cpu == "arm" && arm_use_thumb) || current_cpu == "arm64") { if (arm_use_neon) { deps += [ ":zlib_adler32_simd" ] |