Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Chromium 130.0.6723.91 #3077

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion chromium_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
130.0.6723.69
130.0.6723.91
Original file line number Diff line number Diff line change
Expand Up @@ -2458,7 +2458,7 @@
}

std::optional<SigninInterceptionHeuristicOutcome>
@@ -1484,16 +1475,6 @@ void DiceWebSigninInterceptor::
@@ -1492,16 +1483,6 @@ void DiceWebSigninInterceptor::
g_browser_process->browser_policy_connector(),
g_browser_process->system_network_context_manager()
->GetSharedURLLoaderFactory());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

--- a/build/config/locales.gni
+++ b/build/config/locales.gni
@@ -166,12 +166,6 @@
@@ -166,12 +166,6 @@ _non_android_locales = [ "cy" ]

# Setup |platform_pak_locales| for each platform.
platform_pak_locales = all_chrome_locales
Expand Down
30 changes: 26 additions & 4 deletions utils/depot_tools.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# add flag to specify an allowed sysroot
# ensure shallow fetches
# utilize a newer version of gsutil to support later versions of python
# patch gsync to patch apitools to support later versions of python
--- a/gclient.py
+++ b/gclient.py
@@ -126,8 +126,8 @@ DEPOT_TOOLS_DIR = os.path.dirname(os.pat
Expand Down Expand Up @@ -67,7 +68,7 @@

--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -925,8 +925,7 @@ class GitWrapper(SCMWrapper):
@@ -952,8 +952,7 @@ class GitWrapper(SCMWrapper):
self._SetFetchConfig(options)

# Fetch upstream if we don't already have |revision|.
Expand All @@ -77,7 +78,7 @@
self._Fetch(options, prune=options.force)

if not scm.GIT.IsValidRevision(
@@ -942,7 +941,7 @@ class GitWrapper(SCMWrapper):
@@ -969,7 +968,7 @@ class GitWrapper(SCMWrapper):

# This is a big hammer, debatable if it should even be here...
if options.force or options.reset:
Expand All @@ -86,15 +87,15 @@
if options.upstream and upstream_branch:
target = upstream_branch
self._Scrub(target, options)
@@ -957,7 +956,6 @@ class GitWrapper(SCMWrapper):
@@ -984,7 +983,6 @@ class GitWrapper(SCMWrapper):
# to the checkout step.
if not (options.force or options.reset):
self._CheckClean(revision)
- self._CheckDetachedHead(revision, options)

if not current_revision:
current_revision = self._Capture(
@@ -1637,8 +1635,7 @@ class GitWrapper(SCMWrapper):
@@ -1668,8 +1666,7 @@ class GitWrapper(SCMWrapper):
fetch_cmd.append('--no-tags')
elif quiet:
fetch_cmd.append('--quiet')
Expand All @@ -115,3 +116,24 @@

# Google OAuth Context required by gsutil.
LUCI_AUTH_SCOPES = [
@@ -131,6 +131,20 @@ def ensure_gsutil(version, target, clean
with open(gsutil_flag, 'w') as f:
f.write('This flag file is dropped by gsutil.py')

+ subprocess.run(['git', 'apply'], input="""\
+--- a/UC_STAGING/depot_tools/external_bin/gsutil/gsutil_%s/gsutil/third_party/apitools/apitools/base/protorpclite/messages.py
++++ b/UC_STAGING/depot_tools/external_bin/gsutil/gsutil_%s/gsutil/third_party/apitools/apitools/base/protorpclite/messages.py
+@@ -143,7 +143,7 @@ def __str__(self):
+ # Attributes that are reserved by a class definition that
+ # may not be used by either Enum or Message class definitions.
+ _RESERVED_ATTRIBUTE_NAMES = frozenset(
+- ['__module__', '__doc__', '__qualname__'])
++ ['__module__', '__doc__', '__qualname__', '__static_attributes__', '__firstlineno__'])
+ """ % (VERSION, VERSION) + """
+ _POST_INIT_FIELD_ATTRIBUTE_NAMES = frozenset(
+ ['name',
+""", check=True, universal_newlines=True)
+
return gsutil_bin