Merge pull request #7491 from brave/88.0.4315.7

Updated patches from Chromium 88.0.4315.5 to Chromium 88.0.4315.7.
brave · Jan 12, 2021 · 9f9885b · 9f9885b
1 parent 24c5ab8
commit 9f9885b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 928b2bc161e968f9ea75c7f73f1149a11065a9a4..015e7c7a47c77540606442420a6990d756cfd652 100644
+index 5bc48a734b4b85a0e30a2570aa4ff6f776f40a69..e63c1286eef96edc30d7e25e2b5afc1abe9a5400 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -3733,6 +3733,7 @@ if (is_android) {
+@@ -3746,6 +3746,7 @@ if (is_android) {
        "android/java/src/org/chromium/base/task/TaskTraits.java",
        "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
      ]

diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index d401c3cf23a1cd9fe195b62e459c064dd560f09a..3aad6b7ef812917133410ee2a89168de1be6d8c0 100644
+index af426b76bedc2ec8bc50af7d76e78dcaaea67550..5bb5d44b5747c886fb2cb497f62d14b050a04fa6 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=88
 -MINOR=0
 -BUILD=4315
--PATCH=5
+-PATCH=7
 +MINOR=1
 +BUILD=19
 +PATCH=79