From d9b058c694152d2b647de194e74521a79a96063f Mon Sep 17 00:00:00 2001 From: Robo Date: Thu, 31 Oct 2019 13:24:24 -0700 Subject: [PATCH] ci: fix release build on windows (#20859) --- patches/breakpad/.patches | 1 + .../build_win_iwyu_for_breakpad.patch | 30 +++++++++++++++++++ patches/chromium/.patches | 1 + .../build_win_iwyu_for_smil_time.patch | 19 ++++++++++++ patches/config.json | 2 ++ 5 files changed, 53 insertions(+) create mode 100644 patches/breakpad/.patches create mode 100644 patches/breakpad/build_win_iwyu_for_breakpad.patch create mode 100644 patches/chromium/build_win_iwyu_for_smil_time.patch diff --git a/patches/breakpad/.patches b/patches/breakpad/.patches new file mode 100644 index 000000000000..0d9264d1c619 --- /dev/null +++ b/patches/breakpad/.patches @@ -0,0 +1 @@ +build_win_iwyu_for_breakpad.patch diff --git a/patches/breakpad/build_win_iwyu_for_breakpad.patch b/patches/breakpad/build_win_iwyu_for_breakpad.patch new file mode 100644 index 000000000000..32980abd610c --- /dev/null +++ b/patches/breakpad/build_win_iwyu_for_breakpad.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: deepak1556 +Date: Wed, 30 Oct 2019 18:21:45 -0700 +Subject: build,[win]: IWYU for //third_party/breakpad + + +diff --git a/src/common/windows/guid_string.h b/src/common/windows/guid_string.h +index 48a5c1d3708f9398fffbe5f5cda29b4ab2408e70..c3043bcb8817ae5be8682e22985bad2d7a498f43 100644 +--- a/src/common/windows/guid_string.h ++++ b/src/common/windows/guid_string.h +@@ -34,6 +34,7 @@ + + #include + ++#include + #include + + namespace google_breakpad { +diff --git a/src/tools/windows/dump_syms/dump_syms.cc b/src/tools/windows/dump_syms/dump_syms.cc +index 5b7d1777538cd3cfefd0bef45558f900798d6c51..1f22cfc2d14b2523c7ae133c1ba6fe2d66333d47 100644 +--- a/src/tools/windows/dump_syms/dump_syms.cc ++++ b/src/tools/windows/dump_syms/dump_syms.cc +@@ -33,6 +33,7 @@ + #include + #include + ++#include + #include + + #include "common/windows/pdb_source_line_writer.h" diff --git a/patches/chromium/.patches b/patches/chromium/.patches index afd3a386431f..b7ed453bcc4a 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -81,5 +81,6 @@ revert_remove_contentrendererclient_shouldfork.patch build_win_disable_zc_twophase.patch ignore_rc_check.patch build_win_fix_ambiguous_reference_with_msstl.patch +build_win_iwyu_for_smil_time.patch remove_usage_of_incognito_apis_in_the_spellchecker.patch chore_use_electron_resources_not_chrome_for_spellchecker.patch diff --git a/patches/chromium/build_win_iwyu_for_smil_time.patch b/patches/chromium/build_win_iwyu_for_smil_time.patch new file mode 100644 index 000000000000..2d6965fa6bbf --- /dev/null +++ b/patches/chromium/build_win_iwyu_for_smil_time.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: deepak1556 +Date: Wed, 30 Oct 2019 12:23:00 -0700 +Subject: build,[win]: IWYU for //third_party/blink/renderer/core/svg/animation + +Only affects windows release builds, identify the cause and remove this patch. + +diff --git a/third_party/blink/renderer/core/svg/animation/smil_time.h b/third_party/blink/renderer/core/svg/animation/smil_time.h +index b4fec36d9ef15c5492ce6bbe544c11bdfc01ec10..7433a3a1c8578dbeb388628f1050629133c94f83 100644 +--- a/third_party/blink/renderer/core/svg/animation/smil_time.h ++++ b/third_party/blink/renderer/core/svg/animation/smil_time.h +@@ -26,6 +26,7 @@ + #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_SVG_ANIMATION_SMIL_TIME_H_ + #define THIRD_PARTY_BLINK_RENDERER_CORE_SVG_ANIMATION_SMIL_TIME_H_ + ++#include + #include + + #include "base/time/time.h" diff --git a/patches/config.json b/patches/config.json index 4498831cfd6b..aefdc5b39a78 100644 --- a/patches/config.json +++ b/patches/config.json @@ -3,6 +3,8 @@ "src/electron/patches/boringssl": "src/third_party/boringssl/src", + "src/electron/patches/breakpad": "src/third_party/breakpad/breakpad", + "src/electron/patches/perfetto": "src/third_party/perfetto", "src/electron/patches/skia": "src/third_party/skia",