96b32a814c
* chore: bump chromium in DEPS to 2930eb12d56988c2c80bad2797ab036fe493d4e1 * chore: update patches * Revert "disable robotjs-based tests" This reverts commite56adafc1f. * Revert "skip dbus tests (#18409)" This reverts commitaea042cc83. * Revert "skip more dbus tests" This reverts commit68dbef48da. * chore: bump chromium in DEPS to fd62da5601399b92effaa32a943fcd96143c8605 * chore: bump chromium in DEPS to 99f87ca22ee6e7ec953defe694771cb68f47a596 * chore: bump chromium in DEPS to d88778435b4cd9a510a63385b6d4ba24674b9774 * chore: update patches * chore: update ssl_security_state_tab_helper.patch * Remove content_packaged_services https://chromium-review.googlesource.com/c/chromium/src/+/1604203 * chore: fix false positive lint error * views: wireup widget name to crash data https://chromium-review.googlesource.com/c/chromium/src/+/1626640 * chore: bump chromium in DEPS to ab588d36191964c4bca8de5c320534d95606c861 * roll patches
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 2503eb797188cbb22be0ad703a35d30c16dfad9f..f0c614e9e174a2fa362242559026c8c30dee56bf 100644
|
|
--- a/chrome/BUILD.gn
|
|
+++ b/chrome/BUILD.gn
|
|
@@ -1685,7 +1685,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"
|
|
@@ -1709,6 +1709,12 @@ if (!is_android) {
|
|
}
|
|
}
|
|
|
|
+if (is_electron_build) {
|
|
+ group("packed_resources") {
|
|
+ public_deps = [ "//electron:packed_resources" ]
|
|
+ }
|
|
+}
|
|
+
|
|
repack("browser_tests_pak") {
|
|
sources = [
|
|
"$root_gen_dir/chrome/webui_test_resources.pak",
|