diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-05-25 08:35:57 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2022-06-02 17:56:16 +0000 |
| commit | d48470f9f9fe21b2477e007b81ebcbbcdd6b9b09 (patch) | |
| tree | 8b4c63c0d74075798020e05e1f39f847dd1dde87 | |
| parent | 3e8444fbf852db7b5470e2088cec378547100215 (diff) | |
| download | qtwebengine-chromium-d48470f9f9fe21b2477e007b81ebcbbcdd6b9b09.tar.gz | |
Make sure we do not compile minizip from 3rdparty
There are two minizips in chromium src tree, minizip from
third_party/zlib and separate third_party/minizip.
Remove minizip used for fuzzers.
Sources could be removed with next adaptation.
Task-number: QTBUG-103149
Change-Id: I30a9828dece43bf82e0be8d20ab8f2ccb2baab1d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 0547533a515c4a1641f51800fd771c65b255e04b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | chromium/BUILD.gn | 2 | ||||
| -rw-r--r-- | chromium/third_party/minizip/BUILD.gn | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/chromium/BUILD.gn b/chromium/BUILD.gn index f2da2884c35..958735f6dfd 100644 --- a/chromium/BUILD.gn +++ b/chromium/BUILD.gn @@ -417,7 +417,7 @@ group("gn_all") { [ "//third_party/android_crazy_linker:android_crazy_linker_zip_fuzzer" ] } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !use_qt) { # This is only used by ChromeOS, but we want maximal fuzzer coverage, so # run it under linux too. deps += [ diff --git a/chromium/third_party/minizip/BUILD.gn b/chromium/third_party/minizip/BUILD.gn index a525ec21572..44ed9009a0b 100644 --- a/chromium/third_party/minizip/BUILD.gn +++ b/chromium/third_party/minizip/BUILD.gn @@ -2,8 +2,11 @@ # 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("//testing/libfuzzer/fuzzer_test.gni") +assert(!use_qt) + config("minizip_compiler_flags") { if (is_clang) { cflags = [ |