Merge pull request #8509 from brave/90.0.4430.70_master_90

Upgrade patches from Chromium 90.0.4430.61 to Chromium 90.0.4430.70.
brave · Apr 12, 2021 · 79aeb63 · 79aeb63
2 parents 7ce7a91 + c065033
commit 79aeb63
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 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 70911a2154988e11678db1f7ac03c8437d148fe3..10dd1cbf1eb14bbe105daa1196fdab21abd04bf4 100644
+index 3138c97d8f4c935e173c49ec7017c949d432083c..60dad5ea4be4c890deae37d5ba70e011c1bcb050 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -3886,6 +3886,7 @@ if (is_android) {
+@@ -3888,6 +3888,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/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 266b74b3b50ad0e94d9ea814e3f7af6f721eb67b..c91756ed92d3c52ac5a608d1162f6180ab9838ac 100644
+index 2166af00a6ccc875af3fd47eeb3ffa8e4e337d28..7b70a8cc8678da4648e8ae9aea4e2a7528df868c 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1704,6 +1704,7 @@ config("chromium_code") {
+@@ -1711,6 +1711,7 @@ config("chromium_code") {
        cflags += [ "-Wextra-semi" ]
      }
    }

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 3716a10718b2aaed7c97e4c9579bab273707bac2..9426cceae5b5344a9aa5f1533e1c023fc2298e29 100644
+index c418972e1046b00bda596b19882bd5c0e3301ce0..fd2cbdaad8ffaca5bcc50316e2a78899197f3dca 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=90
 -MINOR=0
 -BUILD=4430
--PATCH=61
+-PATCH=70
 +MINOR=1
 +BUILD=25
 +PATCH=11
diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index b20b829650c3bc744ac0494fd98585ecc03c2cbf..28b0535c4e06bede065af1480c336088157967e5 100644
+index 60acfefd43e4a8a74ae45f86fcef13b56b286e8e..20f3dc3b6c81ced082d15ab971569e18e5bb975c 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
 @@ -2501,6 +2501,7 @@ static_library("browser") {