From f8a6aee49d87259d35fada960c9e0dc4eb323e7f Mon Sep 17 00:00:00 2001
From: Jay Harris <jay.harris@outlook.co.nz>
Date: Tue, 16 May 2023 01:41:08 +1200
Subject: [PATCH] Fix windows build

---
 chromium_presubmit_config.json5       | 2 +-
 components/webpack/gen-webpack-grd.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/chromium_presubmit_config.json5 b/chromium_presubmit_config.json5
index 726ae75359a0c..4cfce1fd12d3c 100644
--- a/chromium_presubmit_config.json5
+++ b/chromium_presubmit_config.json5
@@ -153,7 +153,7 @@
     "CheckWebDevStyle": [
       "components/speedreader/resources/speedreader-desktop.css",
       "components/speedreader/resources/third_party/",
-      "components/webpack/gen-webpack-grd.js",
+      "components/webpack/gen-webpack-grd\\.js",
       "test/data/speedreader/",
     ]
   },
diff --git a/components/webpack/gen-webpack-grd.js b/components/webpack/gen-webpack-grd.js
index cd8a15afeb29d..f756751c55032 100644
--- a/components/webpack/gen-webpack-grd.js
+++ b/components/webpack/gen-webpack-grd.js
@@ -15,7 +15,8 @@ function getIncludesString (fileList) {
     const relativePath = filePath.replace(targetDir, '')
     const fileId = idPrefix + relativePath.replace(/[^a-z0-9]/gi, '_').toUpperCase()
     const resourcePath = resourcePathPrefix
-      ? path.join(resourcePathPrefix, relativePath)
+      // Note: We want to use forwardslash regardless of platform.
+      ? path.posix.join(resourcePathPrefix, relativePath)
       : relativePath
     return `<include name="${fileId}" file="${filePath}" resource_path="${resourcePath}" use_base_dir="false" type="BINDATA" />`
   }).join('\n')