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 84802e09d5db2d1d76118e2a1967608072e77cd5..74f88149fc7ec617a89e3b2857e31ee6b32cd8ea 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -589,15 +589,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.
