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

chore: cherry-pick 3030db702eee from chromium #22986

Merged
merged 3 commits into from Apr 9, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions patches/chromium/.patches
Expand Up @@ -100,3 +100,4 @@ move_readablestream_requests_onto_the_stack_before_iteration.patch
streams_convert_state_dchecks_to_checks.patch
cherry-pick-fd211b44535c.patch
cherry-pick-db71a0afc1d0.patch
cherry-pick-3030db702eee.patch
29 changes: 29 additions & 0 deletions patches/chromium/cherry-pick-3030db702eee.patch
@@ -0,0 +1,29 @@
From 3030db702eee4f24e74e84b66024bd0875fd5418 Mon Sep 17 00:00:00 2001
From: Mirko Bonadei <mbonadei@chromium.org>
Date: Tue, 10 Mar 2020 06:04:07 +0000
Subject: [PATCH] [Merge M81] - Point usrsctp to
a68325e7d9ed844cc84ec134192d788586ea6cc1.

Bug: 1059349
Change-Id: I451873d552b6fe0ca6cd481385042bf37a05fbfd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2093604
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/branch-heads/4044@{#735}
Cr-Branched-From: a6d9daf149a473ceea37f629c41d4527bf2055bd-refs/heads/master@{#737173}
---
DEPS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index a95e9b828dda0..e86ca48012b57 100644
--- a/DEPS
+++ b/DEPS
@@ -1463,7 +1463,7 @@ deps = {
},

'src/third_party/usrsctp/usrsctplib':
- Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '7a8bc9a90ca96634aa56ee712856d97f27d903f8',
+ Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + 'a68325e7d9ed844cc84ec134192d788586ea6cc1',

# Display server protocol for Linux.
'src/third_party/wayland/src': {