8edc7a1fb1
* chore: bump chromium in DEPS to 53836640273c3d45b05ad74bdff7323ef0ffc610 * chore: bump chromium in DEPS to 17da1064b910f4170320ff37e971064916aed1dc * Rename attach_same_site_cookies param to force_ignore_site_for_cookies https://chromium-review.googlesource.com/c/chromium/src/+/2162209 * chore: update patch indices * Remove single argument HttpResponseHeaders::AddHeader() method https://chromium-review.googlesource.com/c/chromium/src/+/2155353 * Rename attach_same_site_cookies param to force_ignore_site_for_cookies https://chromium-review.googlesource.com/c/chromium/src/+/2162209 * fixup! Remove single argument HttpResponseHeaders::AddHeader() method * Exchange SandboxType::kInvalid for a CHECK. https://chromium-review.googlesource.com/c/chromium/src/+/2167995 * chore: fix string type on windows Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.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 1c5366d3096ff2616778b67f690521ddd3472030..96b96d23bb88f2c90265461b0ae11e276df1c644 100644
|
|
--- a/tools/gritsettings/resource_ids.spec
|
|
+++ b/tools/gritsettings/resource_ids.spec
|
|
@@ -594,15 +594,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.
|