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

Upgrade from Chromium 99.0.4844.45 to Chromium 99.0.4844.51 (uplift to 1.37.x). #12436

Merged
merged 1 commit into from
Mar 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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": "99.0.4844.45",
"tag": "99.0.4844.51",
"repository": {
"url": "https://github.com/chromium/chromium"
}
Expand Down
20 changes: 10 additions & 10 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 76c1a4b0bce59783c8ea5a060c162e19ee20e6c0..ac9e9aabc42a9a2d5bae7b164a03d2fa4e8ce30c 100644
index 771865462d7215a5575dc46213f3bdc7758303fa..6dd06f38baaf9b1ff666e8c166fb5bae311603b5 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -170,6 +170,7 @@ if (!is_android && !is_mac) {
Expand All @@ -24,15 +24,15 @@ index 76c1a4b0bce59783c8ea5a060c162e19ee20e6c0..ac9e9aabc42a9a2d5bae7b164a03d2fa
extra_substitutions = [
"CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
"CHROMIUM_SHORT_NAME=$chrome_product_short_name",
@@ -481,6 +483,7 @@ if (is_win) {
@@ -482,6 +484,7 @@ if (is_win) {
"//chrome/common:buildflags",
"//chrome/common:version_header",
]
+ deps += [ "//brave:brave_app" ]

if (enable_stripping) {
# At link time, preserve the global symbols specified in the .exports
@@ -553,7 +556,7 @@ if (is_win) {
@@ -554,7 +557,7 @@ if (is_win) {
args =
[
"-b",
Expand All @@ -41,15 +41,15 @@ index 76c1a4b0bce59783c8ea5a060c162e19ee20e6c0..ac9e9aabc42a9a2d5bae7b164a03d2fa
"-v",
chrome_version_full,
"-g",
@@ -627,6 +630,7 @@ if (is_win) {
@@ -628,6 +631,7 @@ if (is_win) {
# this dependency directly copies the file into the framework's
# resources directory.
public_deps += [ ":chrome_framework_widevine_signature" ]
+ public_deps -= [ ":chrome_framework_widevine_signature" ]
}
}

@@ -659,9 +663,11 @@ if (is_win) {
@@ -660,9 +664,11 @@ if (is_win) {
"--scm=0",
]
}
Expand All @@ -61,31 +61,31 @@ index 76c1a4b0bce59783c8ea5a060c162e19ee20e6c0..ac9e9aabc42a9a2d5bae7b164a03d2fa
if (is_chrome_branded) {
# These entitlements are bound to the official Google Chrome signing
# certificate and will not necessarily work in any other build.
@@ -686,6 +692,7 @@ if (is_win) {
@@ -687,6 +693,7 @@ if (is_win) {
info_plist_target = invoker.info_plist_target
} else {
info_plist_target = ":chrome_helper_plist"
+ info_plist_target = ":brave_helper_plist"
}

extra_substitutions = [
@@ -1183,6 +1190,7 @@ if (is_win) {
@@ -1185,6 +1192,7 @@ if (is_win) {
chrome_dylib_version,
"-Wl,-order_file," + rebase_path("app/framework.order", root_build_dir),
]
+ import("//brave/browser/sources.gni") public_deps += brave_chrome_framework_public_deps bundle_deps += brave_chrome_framework_bundle_deps framework_contents += brave_chrome_framework_contents ldflags += brave_chrome_framework_ldflags

if (!is_component_build) {
# Specify a sensible install_name for static builds. The library is
@@ -1367,6 +1375,7 @@ if (is_win) {
@@ -1369,6 +1377,7 @@ if (is_win) {

group("browser_dependencies") {
public_deps = [
+ "//brave:browser_dependencies",
"//build:branding_buildflags",
"//build:chromeos_buildflags",
"//chrome/browser",
@@ -1474,12 +1483,13 @@ group("child_dependencies") {
@@ -1476,12 +1485,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 76c1a4b0bce59783c8ea5a060c162e19ee20e6c0..ac9e9aabc42a9a2d5bae7b164a03d2fa
output = "$target_gen_dir/chrome_exe_version.rc"
}

@@ -1533,6 +1543,7 @@ group("resources") {
@@ -1535,6 +1545,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 d53e1fcd679d38ea20b89384e467b0d671a683fe..0cb54ebb5b9d264ccb79c9640ef7ab15fcbd25e8 100644
index e54820a78d91af845b4c1ba77d7c84f7ba4c55c7..b73118b5224f5d0097bf57eb419536d7e774fb2c 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=99
-MINOR=0
-BUILD=4844
-PATCH=45
-PATCH=51
+MINOR=1
+BUILD=37
+PATCH=76
2 changes: 1 addition & 1 deletion patches/content-renderer-render_frame_impl.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 5b0d4184a0b5f1617628c1d647b815feeb0e797e..a922805d5dcf49ff7e4168c1e24705f2fa9b6009 100644
index aad4b1cdae5d072dca5ae196b18e9d0de413ae63..c160ae24178a5a735d2d0c1cd94bb325047280a5 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4541,6 +4541,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const {
Expand Down