Update to Chromium version 138.0.7204.0 (#1465706)

Mac: Require Xcode 16.3 (16E140) and SDK 15.4 (24E241)
This commit is contained in:
Marshall Greenblatt
2025-05-30 16:54:45 -04:00
parent c5e80eb44a
commit f8a746373e
81 changed files with 1080 additions and 692 deletions

View File

@@ -1,5 +1,5 @@
diff --git base/test/BUILD.gn base/test/BUILD.gn
index e7f8b523e899a..234e5e0e3a2e3 100644
index 5c286d8d8f664..1ea302897d823 100644
--- base/test/BUILD.gn
+++ base/test/BUILD.gn
@@ -216,11 +216,6 @@ static_library("test_support") {
@@ -14,7 +14,7 @@ index e7f8b523e899a..234e5e0e3a2e3 100644
deps += [
":amalgamated_perfetto_sql_stdlib",
":gen_cc_chrome_track_event_descriptor",
@@ -616,7 +611,7 @@ if (enable_base_tracing) {
@@ -615,7 +610,7 @@ if (enable_base_tracing) {
# processor depends on dev_sqlite. The two share the same symbols but have
# different implementations, so we need to hide dev_sqlite in this shared
# library even in non-component builds to prevent duplicate symbols.
@@ -23,7 +23,7 @@ index e7f8b523e899a..234e5e0e3a2e3 100644
if (is_ios) {
_target_type = "ios_framework_bundle"
}
@@ -625,6 +620,8 @@ if (enable_base_tracing) {
@@ -624,6 +619,8 @@ if (enable_base_tracing) {
defines = [ "TEST_TRACE_PROCESSOR_IMPL" ]
testonly = true
sources = [
@@ -32,7 +32,7 @@ index e7f8b523e899a..234e5e0e3a2e3 100644
"test_trace_processor_export.h",
"test_trace_processor_impl.cc",
"test_trace_processor_impl.h",
@@ -642,33 +639,6 @@ if (enable_base_tracing) {
@@ -641,33 +638,6 @@ if (enable_base_tracing) {
output_name = "TestTraceProcessor"
bundle_deps_filter = [ "//third_party/icu:icudata" ]
}
@@ -67,7 +67,7 @@ index e7f8b523e899a..234e5e0e3a2e3 100644
} else if (!is_component_build && is_mac) {
# Provide a dummy target in order for clients to not have to special-case
diff --git base/test/test_trace_processor_export.h base/test/test_trace_processor_export.h
index f5191b804bc07..aadb7d66ba4c3 100644
index 94b5a2ab1e751..6dacffae228ef 100644
--- base/test/test_trace_processor_export.h
+++ base/test/test_trace_processor_export.h
@@ -5,6 +5,7 @@
@@ -78,8 +78,8 @@ index f5191b804bc07..aadb7d66ba4c3 100644
#if defined(WIN32)
#if defined(TEST_TRACE_PROCESSOR_IMPL)
@@ -23,4 +24,8 @@
@@ -17,4 +18,8 @@
#define TEST_TRACE_PROCESSOR_EXPORT __attribute__((visibility("default")))
#endif // defined(WIN32)
+#else // defined(COMPONENT_BUILD)
@@ -88,10 +88,10 @@ index f5191b804bc07..aadb7d66ba4c3 100644
+
#endif // BASE_TEST_TEST_TRACE_PROCESSOR_EXPORT_H_
diff --git content/shell/BUILD.gn content/shell/BUILD.gn
index 205af82b45ce2..5944a9aa253f2 100644
index d257dbbb2e6f4..886c8e8bc05d7 100644
--- content/shell/BUILD.gn
+++ content/shell/BUILD.gn
@@ -936,7 +936,6 @@ if (is_mac) {
@@ -934,7 +934,6 @@ if (is_mac) {
# Specify a sensible install_name for static builds. The library is
# dlopen()ed so this is not used to resolve the module.
ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$output_name.framework/$output_name" ]