From d18a738a33e3f62b07af540b62d535068ede97e3 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 14 Oct 2019 17:29:55 +0200 Subject: [PATCH] macOS: Fix Jumbo/component build dependency issue. Fixes the following error: In file included from gen/chrome/browser/safe_browsing/safe_browsing_jumbo_1.cc:34: In file included from ./../../chrome/browser/safe_browsing/download_protection/binary_fcm_service.cc:15: ../../components/gcm_driver/gcm_profile_service.h:18:10: fatal error: 'components/gcm_driver/gcm_buildflags.h' file not found --- patch/patch.cfg | 4 ++++ patch/patches/chrome_browser_safe_browsing.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 patch/patches/chrome_browser_safe_browsing.patch diff --git a/patch/patch.cfg b/patch/patch.cfg index b3b5ae88e..700998666 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -217,6 +217,10 @@ patches = [ # https://bitbucket.org/chromiumembedded/cef/issues/2622 'name': 'chrome_browser_product_override', }, + { + # Fix Jumbo/component build dependency issue. + 'name': 'chrome_browser_safe_browsing', + }, { # Allow CEF to share Chrome plugin loading code. 'name': 'chrome_plugins', diff --git a/patch/patches/chrome_browser_safe_browsing.patch b/patch/patches/chrome_browser_safe_browsing.patch new file mode 100644 index 000000000..f51f6b3b2 --- /dev/null +++ b/patch/patches/chrome_browser_safe_browsing.patch @@ -0,0 +1,12 @@ +diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn +index 3599895eb5c5..971ae4d3c1b6 100644 +--- chrome/browser/safe_browsing/BUILD.gn ++++ chrome/browser/safe_browsing/BUILD.gn +@@ -229,6 +229,7 @@ jumbo_static_library("safe_browsing") { + "//chrome/common/safe_browsing:download_type_util", + "//chrome/services/file_util/public/cpp", + "//components/content_settings/core/browser", ++ "//components/gcm_driver:gcm_buildflags", + "//components/language/core/common", + "//components/prefs", + "//components/safe_browsing/db",