From 08da2b0b07b1095de2fae5eafa8d3f18ef904d9e Mon Sep 17 00:00:00 2001 From: Calvin Date: Tue, 1 Apr 2025 05:42:14 -0600 Subject: [PATCH] chore: move build files to build/ dir (#46368) --- BUILD.gn | 6 +++--- electron_paks.gni => build/electron_paks.gni | 0 electron_resources.grd => build/electron_resources.grd | 0 js2c_toolchain.gni => build/js2c_toolchain.gni | 0 patches/chromium/gritsettings_resource_ids.patch | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename electron_paks.gni => build/electron_paks.gni (100%) rename electron_resources.grd => build/electron_resources.grd (100%) rename js2c_toolchain.gni => build/js2c_toolchain.gni (100%) diff --git a/BUILD.gn b/BUILD.gn index a64f6f57154b..d1a008347437 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -17,19 +17,19 @@ import("//tools/grit/repack.gni") import("//tools/v8_context_snapshot/v8_context_snapshot.gni") import("//v8/gni/snapshot_toolchain.gni") import("build/asar.gni") +import("build/electron_paks.gni") import("build/extract_symbols.gni") +import("build/js2c_toolchain.gni") import("build/npm.gni") import("build/templated_file.gni") import("build/tsc.gni") import("build/webpack/webpack.gni") import("buildflags/buildflags.gni") -import("electron_paks.gni") import("filenames.auto.gni") import("filenames.gni") import("filenames.hunspell.gni") import("filenames.libcxx.gni") import("filenames.libcxxabi.gni") -import("js2c_toolchain.gni") if (is_mac) { import("//build/config/mac/rules.gni") @@ -314,7 +314,7 @@ asar("default_app_asar") { } grit("resources") { - source = "electron_resources.grd" + source = "build/electron_resources.grd" outputs = [ "grit/electron_resources.h", diff --git a/electron_paks.gni b/build/electron_paks.gni similarity index 100% rename from electron_paks.gni rename to build/electron_paks.gni diff --git a/electron_resources.grd b/build/electron_resources.grd similarity index 100% rename from electron_resources.grd rename to build/electron_resources.grd diff --git a/js2c_toolchain.gni b/build/js2c_toolchain.gni similarity index 100% rename from js2c_toolchain.gni rename to build/js2c_toolchain.gni diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch index 7b66ab45be6c..85844f69c5a3 100644 --- a/patches/chromium/gritsettings_resource_ids.patch +++ b/patches/chromium/gritsettings_resource_ids.patch @@ -6,7 +6,7 @@ Subject: gritsettings_resource_ids.patch Add electron resources file to the list of resource ids generation. diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index 77707df02c02ba2ffd66ac280d53479993498fff..acc783a27d84465b81b8aef8b6f151a9ad5f0669 100644 +index 77707df02c02ba2ffd66ac280d53479993498fff..190041e44a76aecb968774a1f63579e13042a131 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -1480,6 +1480,11 @@ @@ -15,7 +15,7 @@ index 77707df02c02ba2ffd66ac280d53479993498fff..acc783a27d84465b81b8aef8b6f151a9 "messages": [10080], + }, + -+ "electron/electron_resources.grd": { ++ "electron/build/electron_resources.grd": { + "messages": [31750], + "includes": [31950], }