Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions meta-chromium/recipes-browser/chromium/chromium-gn.inc
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@ SRC_URI += "\
file://fix-SYS_SECCOMP-redefinition.patch \
file://chromium-145-zip_ffi_glue-use-edition2024.patch \
file://disable-sanitizer.patch \
file://Backport-151-Only-pass-sysroot-if-use_sysroot.patch \
file://Backport-151-build-Omit-ar-from-inputs-when-resolved-via-PATH.patch \
file://Backport-151-build-Fix-get_path_info-on-empty-ar-in-unbundle-tool.patch \
file://0014-add-missing-logging-header.patch \
file://Backport-152-don-t-depends-on-histograms.xml-if-it-is-not-git-che.patch \
"

# ARM/AArch64-specific patches.
Expand Down
45 changes: 22 additions & 23 deletions meta-chromium/recipes-browser/chromium/chromium.inc

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,30 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>
---
build/config/compiler/BUILD.gn | 25 +++++--------------
build/config/compiler/BUILD.gn | 27 +++++---------------
build/config/sanitizers/sanitizers.gni | 7 -------
2 files changed, 5 insertions(+), 27 deletions(-)
2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index c092446fa0..ce6d73d30c 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -588,12 +588,6 @@
@@ -576,14 +576,6 @@ config("compiler") {
if (is_clang) {
# Flags for diagnostics.
cflags += [ "-fcolor-diagnostics" ]
- if (!is_win) {
- cflags += [ "-fdiagnostics-show-inlining-chain" ]
- } else {
- # Combine after https://github.com/llvm/llvm-project/pull/192241
- cflags += [ "/clang:-fdiagnostics-show-inlining-chain" ]
- if (!is_wasm) {
- if (!is_win) {
- cflags += [ "-fdiagnostics-show-inlining-chain" ]
- } else {
- # Combine after https://github.com/llvm/llvm-project/pull/192241
- cflags += [ "/clang:-fdiagnostics-show-inlining-chain" ]
- }
- }
if (diagnostics_print_source_range_info && !is_win) {
cflags += [ "-fdiagnostics-print-source-range-info" ]
}
@@ -624,13 +624,6 @@
@@ -614,13 +606,6 @@ config("compiler") {
]
}

Expand All @@ -64,7 +66,7 @@ index c092446fa0..ce6d73d30c 100644
# TODO(hans): Remove this once Clang generates better optimized debug info
# by default. https://crbug.com/765793
cflags += [
@@ -668,13 +661,6 @@
@@ -658,13 +643,6 @@ config("compiler") {
cflags += [ "-ffp-contract=off" ]
}

Expand All @@ -78,7 +80,7 @@ index c092446fa0..ce6d73d30c 100644
}

# C11/C++11 compiler flags setup.
@@ -2196,6 +2182,11 @@
@@ -1895,6 +1873,11 @@ config("default_warnings") {

if (is_clang) {
cflags += [
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
From 27f8690db999f6e56f0af7a9ea3d28a019ed72ca Mon Sep 17 00:00:00 2001
From: Fumitoshi Ukai <ukai@google.com>
Date: Tue, 30 Jun 2026 18:32:03 -0700
Subject: [PATCH] don't depends on histograms.xml if it is not git checkout

histograms.xml is only generated on git checkout.

Bug: 329080012
Change-Id: Iea4484f8af4cf9ef25e25ea1df2c616fbe46ed5c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8019063
Reviewed-by: Jesse McKenna <jessemckenna@google.com>
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
Auto-Submit: Fumitoshi Ukai <ukai@google.com>
Cr-Commit-Position: refs/heads/main@{#1655184}
Upstream-Status: Backport
---
tools/metrics/BUILD.gn | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/metrics/BUILD.gn b/tools/metrics/BUILD.gn
index c826e9708bf6a..23799c76dd7ef 100644
--- a/tools/metrics/BUILD.gn
+++ b/tools/metrics/BUILD.gn
@@ -41,11 +41,11 @@ group("metrics_metadata") {
]

# Only include histograms_xml if we have access to dirmd data, which
- # is used to populate ownership information. This is only set to false
- # for non-git checkouts.
- # TODO(crbug.com/329080012): Remove this once dirmd works in non-git
- # checkouts.
- if (generate_location_tags) {
+ # is used to populate ownership information. This is disabled
+ # for non-git checkouts, as dirmd doesn't work on non-git checkout.
+ # TODO(crbug.com/329080012): Remove this condition once dirmd works
+ # in non-git checkouts.
+ if (path_exists("//.git")) {
deps += [ ":histograms_xml" ]
}
}
--
2.55.0