Skip to content

Commit

Permalink
Merge pull request #12889 from brave/100.0.4896.79_master
Browse files Browse the repository at this point in the history
Upgrade from Chromium 100.0.4896.58 to Chromium 100.0.4896.79
  • Loading branch information
mkarolin authored Apr 5, 2022
2 parents ee12ecf + 87ef553 commit 3be2953
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "100.0.4896.60",
"tag": "100.0.4896.79",
"repository": {
"url": "https://github.com/chromium/chromium"
}
Expand Down
8 changes: 4 additions & 4 deletions patches/chrome-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 0cfd59aa05b0d8e837c8057f00c593b4878539b2..0832934b75e7fb63f697c3021eb32f2c01a54a95 100644
index 51555df59f2bf9d0f396b9ffea0524a2533274ec..9bee759c22314e597d914cc6d610a123f89b22d1 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -170,6 +170,7 @@ if (!is_android && !is_mac) {
Expand Down Expand Up @@ -77,15 +77,15 @@ index 0cfd59aa05b0d8e837c8057f00c593b4878539b2..0832934b75e7fb63f697c3021eb32f2c

if (!is_component_build) {
# Specify a sensible install_name for static builds. The library is
@@ -1387,6 +1395,7 @@ if (is_win) {
@@ -1390,6 +1398,7 @@ if (is_win) {

group("browser_dependencies") {
public_deps = [
+ "//brave:browser_dependencies",
"//build:branding_buildflags",
"//build:chromeos_buildflags",
"//chrome/browser",
@@ -1494,12 +1503,13 @@ group("child_dependencies") {
@@ -1497,12 +1506,13 @@ group("child_dependencies") {
# this is OK because all of content is linked into one library.
"//content/browser",
]
Expand All @@ -100,7 +100,7 @@ index 0cfd59aa05b0d8e837c8057f00c593b4878539b2..0832934b75e7fb63f697c3021eb32f2c
output = "$target_gen_dir/chrome_exe_version.rc"
}

@@ -1553,6 +1563,7 @@ group("resources") {
@@ -1556,6 +1566,7 @@ group("resources") {
"//chrome/browser:resources",
"//chrome/common:resources",
"//chrome/renderer:resources",
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index ee1b58165dd36442bb9c45dd0e04283185cd8961..6e19a19b7617484efd772f381859d8505602fb85 100644
index 452e5fa702f5857020c05dbce0b4874c95ac7364..3c584b28a283b2f8f65f7638e50b33bf4f4ec659 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=100
-MINOR=0
-BUILD=4896
-PATCH=60
-PATCH=79
+MINOR=1
+BUILD=39
+PATCH=31
4 changes: 2 additions & 2 deletions patches/chrome-browser-about_flags.cc.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 81876b3c1a1576af78b919b00ad05e96c9a29394..6d333d7d63494b1d38c11aa69509769b3b1a3d2e 100644
index 7540a4823c30c7a7219aeab246a79a2144961adf..a892ee1556a757ede5b87a6f72becd066c4da6aa 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2865,6 +2865,7 @@ constexpr FeatureEntry::FeatureVariation kLensStandaloneVariations[] = {
@@ -2866,6 +2866,7 @@ constexpr FeatureEntry::FeatureVariation kLensStandaloneVariations[] = {
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-test-BUILD.gn.patch
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 768da31eb760ed382465f65bf34589f7e8dd794d..37af2a42d72ce17fe9413ded36d6b24b4b3d5477 100644
index 028d269850e66db444591cda7005a0f8434193e9..5ebaaa29519642c488db4b84d9ae24a1392a6664 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -303,6 +303,7 @@ static_library("test_support") {
Expand Down

0 comments on commit 3be2953

Please sign in to comment.