Skip to content

Commit 24b4cdf

Browse files
chromium: Fix build race condition (#812)
Fixes #811. Build and patch changes: ------------------------ Add one backported patch to fix a build race condition that would sometimes lead to build errors. License changes: ---------------- Added licenses: none. Removed licenses: none. Updated licenses: none. Test-built: ----------- * chromium-wayland: - nanbield, clang, MACHINE=qemuarm64 * chromium-x11: - master, clang, MACHINE=qemuarm Signed-off-by: Max Ihlenfeldt <[email protected]>
1 parent 1dca432 commit 24b4cdf

File tree

2 files changed

+55
-0
lines changed

2 files changed

+55
-0
lines changed

meta-chromium/recipes-browser/chromium/chromium-gn.inc

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ B = "${S}/${OUTPUT_DIR}"
1313
# Backported patches.
1414
SRC_URI += "\
1515
file://backport/Make-toolchain_supports_rust_thin_lto-configurable.patch \
16+
file://backport/Add-missing-components-enterprise-buildflag.patch \
1617
"
1718
# Non-specific patches.
1819
SRC_URI += "\
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
From d695f5ed165f88b157dcc9d150a05ce756405fa7 Mon Sep 17 00:00:00 2001
2+
From: Takuto Ikuta <[email protected]>
3+
Date: Thu, 25 Apr 2024 07:25:32 +0000
4+
Subject: [PATCH] Backport "Add missing components/enterprise/buildflags
5+
dependency"
6+
7+
This is a backport of two CLs that add missing dependencies to fix a
8+
build race condition that would sometimes lead to build errors. Both CLs
9+
will be included in upstream's 126 release.
10+
11+
Upstream-Status: Backport [https://crrev.com/c/5487538, https://crrev.com/c/5526618]
12+
Signed-off-by: Max Ihlenfeldt <[email protected]>
13+
---
14+
chrome/browser/devtools/BUILD.gn | 1 +
15+
chrome/browser/extensions/BUILD.gn | 1 +
16+
chrome/browser/safe_browsing/BUILD.gn | 1 +
17+
3 files changed, 3 insertions(+)
18+
19+
diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn
20+
index 159ee09..fee4c31 100644
21+
--- a/chrome/browser/devtools/BUILD.gn
22+
+++ b/chrome/browser/devtools/BUILD.gn
23+
@@ -113,6 +113,7 @@ static_library("devtools") {
24+
"//chrome/browser/autofill:autofill",
25+
"//components/autofill/content/browser:browser",
26+
"//components/autofill/core/browser:browser",
27+
+ "//components/enterprise/buildflags",
28+
"//components/paint_preview/buildflags:buildflags",
29+
"//content/public/browser",
30+
"//net",
31+
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
32+
index 0ca4995..554cc16 100644
33+
--- a/chrome/browser/extensions/BUILD.gn
34+
+++ b/chrome/browser/extensions/BUILD.gn
35+
@@ -853,6 +853,7 @@ static_library("extensions") {
36+
"//components/embedder_support",
37+
"//components/embedder_support:browser_util",
38+
"//components/enterprise",
39+
+ "//components/enterprise/buildflags",
40+
"//components/favicon/content",
41+
"//components/feedback",
42+
"//components/gcm_driver",
43+
diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
44+
index 4a67fbf..031e76b 100644
45+
--- a/chrome/browser/safe_browsing/BUILD.gn
46+
+++ b/chrome/browser/safe_browsing/BUILD.gn
47+
@@ -31,6 +31,7 @@ static_library("safe_browsing") {
48+
"//chrome/common:constants",
49+
"//components/browser_sync",
50+
"//components/enterprise:enterprise",
51+
+ "//components/enterprise/buildflags",
52+
"//components/enterprise/common:strings",
53+
"//components/keyed_service/content",
54+
"//components/language/core/browser",

0 commit comments

Comments
 (0)