0979bfc9c1
* chore: bump chromium in DEPS to edc531fae69669e1d2c51901c686b055da965f2d
* Update patches
* Update to use content::DevToolsAgentHostClientChannel.
9d14e4b8a3
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
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 9def0bb9dda87c476fdf3b52ce4d4125f37c7f49..90c81d2a9711d88284d960149e25db55ae8dc1c2 100644
|
|
--- a/tools/gritsettings/resource_ids.spec
|
|
+++ b/tools/gritsettings/resource_ids.spec
|
|
@@ -573,15 +573,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.
|