chromium: Upgrade to 150.0.7871.114 #1010
+236
−85
There are no files selected for viewing
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| From b93239da427a5019a9742d44e50e9996c1b04ea9 Mon Sep 17 00:00:00 2001 | ||
| From: Nathan Pratta Teodosio <nathan.teodosio@canonical.com> | ||
| Date: Fri, 19 Jun 2026 09:06:46 -0700 | ||
| Subject: [PATCH] Only pass sysroot if use_sysroot. | ||
|
|
||
| Fixes the build when use_sysroot = false as then 'sysroot' variable is empty. | ||
|
|
||
| Bug: None | ||
| Change-Id: I7fc7ba35f3ba416af0cbd8df94393dc901724b8b | ||
| Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7927226 | ||
| Reviewed-by: Sylvain Defresne <sdefresne@chromium.org> | ||
| Commit-Queue: Andrew Grieve <agrieve@chromium.org> | ||
| Reviewed-by: Andrew Grieve <agrieve@chromium.org> | ||
| Cr-Commit-Position: refs/heads/main@{#1649706} | ||
|
|
||
| Upstream-Status: Backport | ||
| --- | ||
| build/modules/BUILD.gn | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/build/modules/BUILD.gn b/build/modules/BUILD.gn | ||
| index 02bfd462acd0f..3ef79fa7933c3 100644 | ||
| --- a/build/modules/BUILD.gn | ||
| +++ b/build/modules/BUILD.gn | ||
| @@ -223,7 +223,7 @@ | ||
| # otherwise. | ||
| "--append-module=std.new:export new_h\\nexport vcruntime_exception", | ||
| ] | ||
| - } else { | ||
| + } else if (use_sysroot) { | ||
| # We need to pass the sysroot in so that it can scan it to generate a | ||
| # modulemap for the sysroot headers. | ||
| args += [ | ||
| -- | ||
| 2.54.0 | ||
|
|
|
Collaborator
There was a problem hiding this comment. Why do we need this and
Contributor
Author
There was a problem hiding this comment. See the commit message for the error generated otherwise. Apparently |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| From 7d6555b11f181bdc24ba56577f753a07add6e8c7 Mon Sep 17 00:00:00 2001 | ||
| From: Matt Jolly <kangie@gentoo.org> | ||
| Date: Tue, 16 Jun 2026 21:57:07 -0700 | ||
| Subject: [PATCH] build: Fix get_path_info on empty ar in unbundle toolchain | ||
|
|
||
| Some toolchains leave ar empty during initial setup, causing GN to error | ||
| when get_path_info() is called with an empty string. Guard the check to | ||
| only run when ar is not empty. | ||
|
|
||
| Signed-off-by: Matt Jolly <kangie@gentoo.org> | ||
| Change-Id: I87615806ddfda6f262a7500b0c5b6fed1f452985 | ||
| Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7949777 | ||
| Reviewed-by: Takuto Ikuta <tikuta@chromium.org> | ||
| Commit-Queue: Takuto Ikuta <tikuta@chromium.org> | ||
| Reviewed-by: Matt Stark <msta@google.com> | ||
| Cr-Commit-Position: refs/heads/main@{#1648076} | ||
|
|
||
| Upstream-Status: Backport | ||
| --- | ||
| build/toolchain/gcc_toolchain.gni | 5 +++-- | ||
| 1 file changed, 3 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni | ||
| index ec66ab3f948b1..d8457bfa53a4e 100644 | ||
| --- a/build/toolchain/gcc_toolchain.gni | ||
| +++ b/build/toolchain/gcc_toolchain.gni | ||
| @@ -409,8 +409,9 @@ template("single_gcc_toolchain") { | ||
| } else { | ||
| command = "rm -f {{output}} && $command" | ||
|
|
||
| - # Add ar to inputs if it's not from $PATH. | ||
| - if (get_path_info(ar, "file") != ar) { | ||
| + # Add ar to inputs if it's not from $PATH. Some toolchains leave | ||
| + # |ar| empty during toolchain setup, so guard get_path_info() here. | ||
| + if (ar != "" && get_path_info(ar, "file") != ar) { | ||
| inputs = | ||
| [ get_path_info(rebase_path(ar, ".", root_out_dir), "abspath") ] | ||
| } | ||
| -- | ||
| 2.55.0 | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| From 60f987d8d5f7272793a40290d060b8f50933f825 Mon Sep 17 00:00:00 2001 | ||
| From: Takuto Ikuta <tikuta@chromium.org> | ||
| Date: Mon, 8 Jun 2026 19:43:20 -0700 | ||
| Subject: [PATCH] build: Omit ar from inputs when resolved via $PATH | ||
|
|
||
| The GN build configuration previously added the `ar` tool to the inputs | ||
| list unconditionally. However, if the `ar` tool is specified simply by | ||
| its filename and is resolved via the system `$PATH`, it should not be | ||
| tracked as a direct input dependency. | ||
|
|
||
| This change adds a condition to verify if `ar` is an explicit path | ||
| rather than just a filename. It only includes `ar` in the action's | ||
| inputs list when it is not resolved from `$PATH`. | ||
|
|
||
| This is to address | ||
| https://crrev.com/c/7835150/8/build/toolchain/gcc_toolchain.gni#406 | ||
|
|
||
| Bug: 358521078 | ||
| Change-Id: I096ac4aa7f3b697c58c94af1349159b9c87f4201 | ||
| Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7904982 | ||
| Commit-Queue: Takuto Ikuta <tikuta@chromium.org> | ||
| Reviewed-by: Matt Stark <msta@google.com> | ||
| Auto-Submit: Takuto Ikuta <tikuta@chromium.org> | ||
| Cr-Commit-Position: refs/heads/main@{#1643634} | ||
|
|
||
| Upstream-Status: Backport | ||
| --- | ||
| build/toolchain/gcc_toolchain.gni | 8 ++++++-- | ||
| 1 file changed, 6 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni | ||
| index 51433d488da07..ec66ab3f948b1 100644 | ||
| --- a/build/toolchain/gcc_toolchain.gni | ||
| +++ b/build/toolchain/gcc_toolchain.gni | ||
| @@ -408,8 +408,12 @@ template("single_gcc_toolchain") { | ||
| command = "cmd /s /c \"\"$python_path\" $tool_wrapper_path delete-file {{output}} && $command\"" | ||
| } else { | ||
| command = "rm -f {{output}} && $command" | ||
| - inputs = | ||
| - [ get_path_info(rebase_path(ar, ".", root_out_dir), "abspath") ] | ||
| + | ||
| + # Add ar to inputs if it's not from $PATH. | ||
| + if (get_path_info(ar, "file") != ar) { | ||
| + inputs = | ||
| + [ get_path_info(rebase_path(ar, ".", root_out_dir), "abspath") ] | ||
| + } | ||
| } | ||
|
|
||
| # Almost all targets build with //build/config/compiler:thin_archive which | ||
| -- | ||
| 2.55.0 | ||
|
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we name this
Backport-151-Only-pass-sysroot-if-use_sysroot.patchso we know from the file name that it's a backport and it will be included in upstream 151?The same applies to the two other backports if we do need to keep them.
(I've filed #1011 for unifying all patches' names.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since chromium git does not seem to use tags recently (the latest one is 148.0.7734.5), how should I know from which version a commit is backported?