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.

Sign up for GitHub

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

Jump to bottom

Upgrade patches from Chromium 79.0.3945.88 to Chromium 79.0.3945.117 #4319

Merged
merged 1 commit into from
Jan 7, 2020
Merged

Upgrade patches from Chromium 79.0.3945.88 to Chromium 79.0.3945.117 #4319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions patches/android_webview-browser-cookie_manager.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/android_webview/browser/cookie_manager.cc b/android_webview/browser/cookie_manager.cc
index c2030c1693cd1cd457709dff43e03cd2dc5c29bf..c412c8a0946f32e6e66e486212c2e1d4b5fff0aa 100644
index 0ad2b9f6eddbbd3fc7bd50fbfbb14fe917d68864..89a803426db728b93bde3f59933364ae04de8ae6 100644
--- a/android_webview/browser/cookie_manager.cc
+++ b/android_webview/browser/cookie_manager.cc
@@ -426,7 +426,7 @@ void CookieManager::SetCookieHelper(const GURL& host,
@@ -435,7 +435,7 @@ void CookieManager::SetCookieHelper(const GURL& host,

net::CanonicalCookie::CookieInclusionStatus status;
std::unique_ptr<net::CanonicalCookie> cc(
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 2c275bcc2bdbd1f5800bba649064b9fc95859af3..37fe68b6b987b375ec31b51ecc71ba9faf0e3277 100644
index 801f6a7b54285681a96a3a8590945d302697c6ca..a1b21ec827e1762b458de783a998b949e5337d3d 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=79
-MINOR=0
-BUILD=3945
-PATCH=88
-PATCH=117
+MINOR=1
+BUILD=5
+PATCH=16
2 changes: 1 addition & 1 deletion patches/chrome-test-BUILD.gn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 5348e244d9eadaeba5cca5bd7a2ea0359864cb28..5cbe0da0892e9629cd76cad6aadec1b7dcdb9ed9 100644
index 28f9a5eab90529bd9268f681b26eef2612cf5902..0a02dfe039024a2bcf2d174c531bc001174f1cc4 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -747,6 +747,7 @@ if (!is_android) {
Expand Down