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

chore: bump chromium to 100.0.4896.75 (18-x-y) #33619

Merged
merged 2 commits into from Apr 6, 2022
Merged

chore: bump chromium to 100.0.4896.75 (18-x-y) #33619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6963c96
chore: bump chromium in DEPS to 100.0.4896.75
electron-roller[bot] Apr 5, 2022
8642425
chore: update patches
patchup[bot] Apr 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ gclient_gn_args = [

vars = {
'chromium_version':
'100.0.4896.60',
'100.0.4896.75',
'node_version':
'v16.13.2',
'nan_version':
Expand Down
12 changes: 6 additions & 6 deletions patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this
patch.

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 0cf38ad237727254c77472f73d82d6f65fe14bde..83d9746bd6f5b4b9a87d2e9ee185e0e8a8300490 100644
index f2c4feac76e96575de3627b7e8f2373b4fb30411..f5fa6b21594c97a08d1aefd790a4846d9b3e1a45 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -171,11 +171,16 @@ if (!is_android && !is_mac) {
Expand Down Expand Up @@ -46,18 +46,18 @@ index 492cd8e11e28e0b427aca227665295a3052af765..760d2171c5083820fbbf66ce5d7d3c80
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 768da31eb760ed382465f65bf34589f7e8dd794d..be82ce60faebd0846d65334110e7a92fe239b6d6 100644
index 028d269850e66db444591cda7005a0f8434193e9..cc0d14cd9798c6bbee80581c95eb8281ce7fb6ba 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -5721,7 +5721,6 @@ test("unit_tests") {
@@ -5722,7 +5722,6 @@ test("unit_tests") {

deps += [
"//chrome:other_version",
- "//chrome:packed_resources_integrity",
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/browser:chrome_process_finder",
@@ -5744,6 +5743,10 @@ test("unit_tests") {
@@ -5745,6 +5744,10 @@ test("unit_tests") {
"//ui/resources",
]

Expand All @@ -68,15 +68,15 @@ index 768da31eb760ed382465f65bf34589f7e8dd794d..be82ce60faebd0846d65334110e7a92f
ldflags = [
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
@@ -6437,7 +6440,6 @@ test("unit_tests") {
@@ -6438,7 +6441,6 @@ test("unit_tests") {
}

deps += [
- "//chrome:packed_resources_integrity_hash",
"//chrome/browser:cart_db_content_proto",
"//chrome/browser:coupon_db_content_proto",
"//chrome/browser/media/router:test_support",
@@ -6482,6 +6484,11 @@ test("unit_tests") {
@@ -6483,6 +6485,11 @@ test("unit_tests") {
"//ui/native_theme:test_support",
"//ui/webui/resources/js/browser_command:mojo_bindings",
]
Expand Down
6 changes: 3 additions & 3 deletions patches/chromium/resource_file_conflict.patch
View file
Open in desktop
Expand Up @@ -52,10 +52,10 @@ Some alternatives to this patch:
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 0cfd59aa05b0d8e837c8057f00c593b4878539b2..0cf38ad237727254c77472f73d82d6f65fe14bde 100644
index 51555df59f2bf9d0f396b9ffea0524a2533274ec..f2c4feac76e96575de3627b7e8f2373b4fb30411 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1593,7 +1593,7 @@ if (is_chrome_branded && !is_android) {
@@ -1596,7 +1596,7 @@ if (is_chrome_branded && !is_android) {
}
}

Expand All @@ -64,7 +64,7 @@ index 0cfd59aa05b0d8e837c8057f00c593b4878539b2..0cf38ad237727254c77472f73d82d6f6
chrome_paks("packed_resources") {
if (is_mac) {
output_dir = "$root_gen_dir/repack"
@@ -1621,6 +1621,12 @@ if (!is_android) {
@@ -1624,6 +1624,12 @@ if (!is_android) {
}
}

Expand Down