62da00e5c5
* chore: bump chromium in DEPS to 7f366dc6e2f06228b12b021cc1486a1de81a257d * chore: bump chromium in DEPS to d785c1a601f5f33627d23e40b1ed9dd94c63d818 * update patches * Rename an old referrer policy value2082856* chore: bump chromium in DEPS to 735e0d2910b2e55c15e0b9cb9fca9431307ac661 * update v8 patches * Update DEPS * update patches * chore: bump chromium in DEPS to b3d09c15c4460680b85218b7b0eb0849c5a6e840 * Replace blink::WebCursorInfo with ui::Cursor1997138* chore: bump chromium in DEPS to bf433ad6dcfcaac460512bb45a53d5a2ea5356f9 * chore: bump chromium in DEPS to 38fad190ac908b6977ab271acc82c2fe74f6e85e * chore: bump chromium in DEPS to aa597178119cb37ab54caeda27b2ef30a2f9a003 * update patches * DownloadURLParameters: Remove NetworkIsolationKey parameter.2050987* fix pdf viewer tests by binding more mojo things * chore: bump chromium in DEPS to 08835601be331b4a223e6e2bd9d5ce6c37cbdec6 Co-authored-by: Jeremy Apthorp <jeremya@chromium.org> Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <jeremya@chromium.org>
|
|
Date: Wed, 8 Jan 2020 16:06:14 -0800
|
|
Subject: FIXME: grit conflicts
|
|
|
|
This works around a bug in grit's handling of generated .grd files.
|
|
|
|
Should be removed once grit is fixed.
|
|
|
|
Tracking bug: https://crbug.com/1040605
|
|
|
|
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
|
|
index 0a93db25931ecf549cfa92b5b101e96cdb92a47a..ba80a27460754d492fe69b7233352542dd25e490 100644
|
|
--- a/tools/gritsettings/resource_ids.spec
|
|
+++ b/tools/gritsettings/resource_ids.spec
|
|
@@ -584,15 +584,16 @@
|
|
"includes": [3840],
|
|
},
|
|
|
|
+ # FIXME: put this back after devtools_resources once grit is fixed to respect META properly
|
|
+ "electron/electron_resources.grd": {
|
|
+ "messages": [3860],
|
|
+ "includes": [4100],
|
|
+ },
|
|
+
|
|
# This file is generated during the build.
|
|
"<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": {
|
|
"META": {"sizes": {"includes": [500],}},
|
|
- "includes": [3860],
|
|
- },
|
|
-
|
|
- "electron/electron_resources.grd": {
|
|
- "messages": [31750],
|
|
- "includes": [31950],
|
|
+ "includes": [4860],
|
|
},
|
|
|
|
# END "everything else" section.
|