150c2bcef9
* chore: bump chromium in DEPS to 124.0.6339.0 * chore: update patches * chore: bump chromium in DEPS to 124.0.6341.0 * chore: update patches * chore: bump chromium in DEPS to 124.0.6343.0 * chore: bump chromium in DEPS to 124.0.6345.0 * chore: update patches * build: temporarily patch out usage of reclient inputs cfg * chore: implement missing OnPortConnectedStateChanged Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5039155 * fix: move NativeHandlers in extensions to new RendererAPIProvider Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5332839 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5334058 * chore: add missing websocket method * refactor: use std::erase instead of base::Erase Ref: https://issues.chromium.org/issues/40256229 * build: fix reclient inputs processor bug (workaround) * fix: delay extensions::Dispatcher construction * chore: bump chromium in DEPS to 124.0.6347.0 * chore: bump chromium in DEPS to 124.0.6349.0 * 5326217: [ViewsAX] Remove WebAXPlatformTreeManagerDelegate https://chromium-review.googlesource.com/c/chromium/src/+/5326217 * 5347916: Get origin from parent for process-isolated srcdoc. https://chromium-review.googlesource.com/c/chromium/src/+/5347916 * chore: patches fixup * 4866222: [api] Deprecate vector<v8::Local>, part 1 https://chromium-review.googlesource.com/c/v8/v8/+/4866222 * 5337304: Remove DXDiag telemetry code. https://chromium-review.googlesource.com/c/chromium/src/+/5337304 * 5328275: Implement watermark routing to the BrowserView https://chromium-review.googlesource.com/c/chromium/src/+/5328275 * [libc++] Rename __fwd/hash.h to __fwd/functional.h and add reference_wrapper * chore: bump chromium in DEPS to 124.0.6351.0 * chore: update patches * 5342763: [object] Fast path for adding props with existing transition https://chromium-review.googlesource.com/c/v8/v8/+/5342763 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
79 lines
2.9 KiB
Diff
79 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <nornagon@nornagon.net>
|
|
Date: Thu, 20 Sep 2018 17:48:59 -0700
|
|
Subject: resource_file_conflict.patch
|
|
|
|
Resolve conflict between //chrome's .pak files and //electron's. The paths
|
|
that chrome code hardcodes require that we generate resources at these
|
|
paths, but GN throws errors if there are multiple targets that generate the
|
|
same files.
|
|
|
|
This is due to the hardcoded names here:
|
|
https://chromium.googlesource.com/chromium/src/+/69.0.3497.106/ui/base/resource/resource_bundle.cc#780
|
|
and here:
|
|
https://chromium.googlesource.com/chromium/src/+/69.0.3497.106/ui/base/resource/resource_bundle_mac.mm#50
|
|
|
|
This isn't needed on Mac because resource files are copied into the app bundle,
|
|
and are built in `$root_out_dir/electron_repack` (while Chromium's resources
|
|
target `$root_out_dir/repack`), but on Windows and Linux, the resource files go
|
|
directly in `$root_out_dir`, and so they conflict.
|
|
|
|
We don't actually ever generate Chromium's resource paks, but without this
|
|
patch, GN refuses to generate the ninja files:
|
|
|
|
ERROR at //tools/grit/repack.gni:35:3: Duplicate output file.
|
|
action(_repack_target_name) {
|
|
^----------------------------
|
|
Two or more targets generate the same output:
|
|
chrome_100_percent.pak
|
|
|
|
This is can often be fixed by changing one of the target names, or by
|
|
setting an output_name on one of them.
|
|
|
|
Collisions:
|
|
//chrome:packed_resources_100_percent
|
|
//electron:packed_resources_100_percent
|
|
|
|
See //tools/grit/repack.gni:35:3: Collision.
|
|
action(_repack_target_name) {
|
|
^----------------------------
|
|
|
|
Some alternatives to this patch:
|
|
|
|
1. Refactor upstream in such a way that the "chrome" pak names were
|
|
configurable, for instance by adding a method to ResourceBundle::Delegate that
|
|
LoadChromeResources would check.
|
|
2. Pass a Delegate that overrides `GetPathForResourcePack`, check for the
|
|
`chrome_{100,200}_percent.pak` filenames, and rewrite them to
|
|
`electron_{100,200}_percent.pak`.
|
|
3. Initialize the resource bundle with DO_NOT_LOAD_COMMON_RESOURCES and load
|
|
the paks ourselves.
|
|
|
|
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 a107e48cbe9d50d2794df3ebadc785e146324f62..4af5b8d5da1c0ae4c5603f49e3a1dbfec422f55e 100644
|
|
--- a/chrome/BUILD.gn
|
|
+++ b/chrome/BUILD.gn
|
|
@@ -1567,7 +1567,7 @@ if (is_chrome_branded && !is_android) {
|
|
}
|
|
}
|
|
|
|
-if (!is_android) {
|
|
+if (!is_android && !is_electron_build) {
|
|
chrome_paks("packed_resources") {
|
|
if (is_mac) {
|
|
output_dir = "$root_gen_dir/repack"
|
|
@@ -1606,6 +1606,12 @@ if (!is_android) {
|
|
}
|
|
}
|
|
|
|
+if (is_electron_build) {
|
|
+ group("packed_resources") {
|
|
+ public_deps = [ "//electron:packed_resources" ]
|
|
+ }
|
|
+}
|
|
+
|
|
if (!is_android) {
|
|
repack("browser_tests_pak") {
|
|
testonly = true
|