mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Update chromium patches

Browse source
This commit is contained in:
Nitish Sakhawalkar 2019-05-13 11:49:01 -07:00
parent f14eb32758
commit e794260d89
52 changed files with 268 additions and 341 deletions
Download patch file Download diff file Expand all files Collapse all files

6
patches/common/chromium/resource_file_conflict.patch
View file

@ -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 b51701cb23a746fa8c85dd308db40599ebb513c4..d40202886f0bafce384a13306de531845758eb1c 100644
index 7878cd09863788f7c35e62a49f50a99a1fcf46d5..cabf18983e659e1608dd02109599b444990975a1 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1646,7 +1646,7 @@ if (is_chrome_branded && !is_android) {
@@ -1719,7 +1719,7 @@ if (is_chrome_branded && !is_android) {
}
}
@ -64,7 +64,7 @@ index b51701cb23a746fa8c85dd308db40599ebb513c4..d40202886f0bafce384a13306de53184
chrome_paks("packed_resources") {
if (is_mac) {
output_dir = "$root_gen_dir/repack"
@@ -1670,6 +1670,12 @@ if (!is_android) {
@@ -1743,6 +1743,12 @@ if (!is_android) {
}
}