Move tint_overrides_with_defaults.gni in scripts subdir
Matches the location of the dawn overrides file
Change-Id: I9d0e5c1e263417aa55795af45d4e182a4dc49311
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/147504
Commit-Queue: Ben Clayton <bclayton@google.com>
Auto-Submit: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
diff --git a/BUILD.gn b/BUILD.gn
index 15788a4..6a774ba 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -13,7 +13,7 @@
# limitations under the License.
import("scripts/dawn_overrides_with_defaults.gni")
-import("tint_overrides_with_defaults.gni")
+import("scripts/tint_overrides_with_defaults.gni")
group("all") {
testonly = true
diff --git a/tint_overrides_with_defaults.gni b/scripts/tint_overrides_with_defaults.gni
similarity index 100%
rename from tint_overrides_with_defaults.gni
rename to scripts/tint_overrides_with_defaults.gni
diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn
index 1083e3f..b97374d 100644
--- a/src/tint/BUILD.gn
+++ b/src/tint/BUILD.gn
@@ -17,7 +17,7 @@
import("//build_overrides/build.gni")
import("../../scripts/dawn_overrides_with_defaults.gni")
-import("../../tint_overrides_with_defaults.gni")
+import("../../scripts/tint_overrides_with_defaults.gni")
if (tint_build_unittests) {
import("//testing/test.gni")
diff --git a/src/tint/api/BUILD.gn b/src/tint/api/BUILD.gn
index bdee3b5..55632ac 100644
--- a/src/tint/api/BUILD.gn
+++ b/src/tint/api/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../tint_overrides_with_defaults.gni")
+import("../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/api/common/BUILD.gn b/src/tint/api/common/BUILD.gn
index 1ecacd3..4bc751d 100644
--- a/src/tint/api/common/BUILD.gn
+++ b/src/tint/api/common/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/api/options/BUILD.gn b/src/tint/api/options/BUILD.gn
index 26814af..e24f6f1 100644
--- a/src/tint/api/options/BUILD.gn
+++ b/src/tint/api/options/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/cmd/BUILD.gn b/src/tint/cmd/BUILD.gn
index bb2d16f..67e46cc 100644
--- a/src/tint/cmd/BUILD.gn
+++ b/src/tint/cmd/BUILD.gn
@@ -20,6 +20,6 @@
# Do not modify this file directly
################################################################################
-import("../../../tint_overrides_with_defaults.gni")
+import("../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/cmd/bench/BUILD.gn b/src/tint/cmd/bench/BUILD.gn
index 0b66d01..b5e4ee9 100644
--- a/src/tint/cmd/bench/BUILD.gn
+++ b/src/tint/cmd/bench/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/cmd/common/BUILD.gn b/src/tint/cmd/common/BUILD.gn
index d6b738d..927b10d 100644
--- a/src/tint/cmd/common/BUILD.gn
+++ b/src/tint/cmd/common/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/cmd/info/BUILD.gn b/src/tint/cmd/info/BUILD.gn
index 712437c..ab691e1 100644
--- a/src/tint/cmd/info/BUILD.gn
+++ b/src/tint/cmd/info/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/cmd/loopy/BUILD.gn b/src/tint/cmd/loopy/BUILD.gn
index b264e44..edceb88 100644
--- a/src/tint/cmd/loopy/BUILD.gn
+++ b/src/tint/cmd/loopy/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/cmd/test/BUILD.gn b/src/tint/cmd/test/BUILD.gn
index a1be8db..b0e3a2b 100644
--- a/src/tint/cmd/test/BUILD.gn
+++ b/src/tint/cmd/test/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/cmd/tint/BUILD.gn b/src/tint/cmd/tint/BUILD.gn
index e759f53..39f43f1 100644
--- a/src/tint/cmd/tint/BUILD.gn
+++ b/src/tint/cmd/tint/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/fuzzers/BUILD.gn b/src/tint/fuzzers/BUILD.gn
index 35dd003..f15436a 100644
--- a/src/tint/fuzzers/BUILD.gn
+++ b/src/tint/fuzzers/BUILD.gn
@@ -13,7 +13,7 @@
# limitations under the License.
import("//build_overrides/build.gni")
-import("../../../tint_overrides_with_defaults.gni")
+import("../../../scripts/tint_overrides_with_defaults.gni")
# Fuzzers - Libfuzzer based fuzzing targets for Chromium
# To run the fuzzers outside of Chromium, use the CMake based builds.
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/BUILD.gn b/src/tint/fuzzers/tint_ast_fuzzer/BUILD.gn
index 5d1a018..1071fdd 100644
--- a/src/tint/fuzzers/tint_ast_fuzzer/BUILD.gn
+++ b/src/tint/fuzzers/tint_ast_fuzzer/BUILD.gn
@@ -13,7 +13,7 @@
# limitations under the License.
import("//build_overrides/build.gni")
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
if (build_with_chromium) {
import("//third_party/protobuf/proto_library.gni")
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/mutation_finders/BUILD.gn b/src/tint/fuzzers/tint_ast_fuzzer/mutation_finders/BUILD.gn
deleted file mode 100644
index 677d638..0000000
--- a/src/tint/fuzzers/tint_ast_fuzzer/mutation_finders/BUILD.gn
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2023 The Tint Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-################################################################################
-# File generated by tools/src/cmd/gen
-# using the template:
-# /home/ben/src/dawn/tools/src/cmd/gen/build/BUILD.gn.tmpl
-#
-# Do not modify this file directly
-################################################################################
-
-import("../../../../../tint_overrides_with_defaults.gni")
-
-import("${tint_src_dir}/tint.gni")
-
-libtint_source_set("mutation_finders") {
- sources = [
- "change_binary_operators.cc",
- "change_binary_operators.h",
- "change_unary_operators.cc",
- "change_unary_operators.h",
- "delete_statements.cc",
- "delete_statements.h",
- "replace_identifiers.cc",
- "replace_identifiers.h",
- "wrap_unary_operators.cc",
- "wrap_unary_operators.h",
- ]
- deps = [
- "${tint_src_dir}/fuzzers/tint_ast_fuzzer",
- "${tint_src_dir}/fuzzers/tint_ast_fuzzer/mutations",
- "${tint_src_dir}/lang/core/type",
- "${tint_src_dir}/lang/wgsl/ast",
- "${tint_src_dir}/lang/wgsl/sem",
- ]
-}
-
-tint_unittests_source_set("unittests") {
- sources = []
- deps = []
-}
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/mutations/BUILD.gn b/src/tint/fuzzers/tint_ast_fuzzer/mutations/BUILD.gn
deleted file mode 100644
index a7ea66f..0000000
--- a/src/tint/fuzzers/tint_ast_fuzzer/mutations/BUILD.gn
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2023 The Tint Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-################################################################################
-# File generated by tools/src/cmd/gen
-# using the template:
-# /home/ben/src/dawn/tools/src/cmd/gen/build/BUILD.gn.tmpl
-#
-# Do not modify this file directly
-################################################################################
-
-import("../../../../../tint_overrides_with_defaults.gni")
-
-import("${tint_src_dir}/tint.gni")
-
-libtint_source_set("mutations") {
- sources = [
- "change_binary_operator.cc",
- "change_binary_operator.h",
- "change_unary_operator.cc",
- "change_unary_operator.h",
- "delete_statement.cc",
- "delete_statement.h",
- "replace_identifier.cc",
- "replace_identifier.h",
- "wrap_unary_operator.cc",
- "wrap_unary_operator.h",
- ]
- deps = [
- "${tint_src_dir}/fuzzers/tint_ast_fuzzer",
- "${tint_src_dir}/lang/core/type",
- "${tint_src_dir}/lang/wgsl/ast",
- "${tint_src_dir}/lang/wgsl/program",
- "${tint_src_dir}/lang/wgsl/sem",
- ]
-}
-
-tint_unittests_source_set("unittests") {
- sources = [
- "change_binary_operator_test.cc",
- "change_unary_operator_test.cc",
- "delete_statement_test.cc",
- "replace_identifier_test.cc",
- "wrap_unary_operator_test.cc",
- ]
- deps = [
- "${tint_src_dir}/fuzzers/tint_ast_fuzzer",
- "${tint_src_dir}/fuzzers/tint_ast_fuzzer/mutations",
- "${tint_src_dir}/lang/wgsl/ast",
- "${tint_src_dir}/lang/wgsl/program",
- "${tint_src_dir}/lang/wgsl/reader",
- "${tint_src_dir}/lang/wgsl/writer",
- ]
-}
diff --git a/src/tint/fuzzers/tint_ast_fuzzer/protobufs/BUILD.gn b/src/tint/fuzzers/tint_ast_fuzzer/protobufs/BUILD.gn
deleted file mode 100644
index bec4630..0000000
--- a/src/tint/fuzzers/tint_ast_fuzzer/protobufs/BUILD.gn
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2023 The Tint Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-################################################################################
-# File generated by tools/src/cmd/gen
-# using the template:
-# /home/ben/src/dawn/tools/src/cmd/gen/build/BUILD.gn.tmpl
-#
-# Do not modify this file directly
-################################################################################
-
-import("../../../../../tint_overrides_with_defaults.gni")
-
-import("${tint_src_dir}/tint.gni")
-
-libtint_source_set("protobufs") {
- sources = [ "tint_ast_fuzzer.h" ]
- deps = []
-}
-
-tint_unittests_source_set("unittests") {
- sources = []
- deps = []
-}
diff --git a/src/tint/fuzzers/tint_regex_fuzzer/BUILD.gn b/src/tint/fuzzers/tint_regex_fuzzer/BUILD.gn
index 3ee991c..78a3623 100644
--- a/src/tint/fuzzers/tint_regex_fuzzer/BUILD.gn
+++ b/src/tint/fuzzers/tint_regex_fuzzer/BUILD.gn
@@ -13,7 +13,7 @@
# limitations under the License.
import("//build_overrides/build.gni")
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
if (build_with_chromium) {
source_set("tint_regex_fuzzer") {
diff --git a/src/tint/lang/BUILD.gn b/src/tint/lang/BUILD.gn
index bb2d16f..67e46cc 100644
--- a/src/tint/lang/BUILD.gn
+++ b/src/tint/lang/BUILD.gn
@@ -20,6 +20,6 @@
# Do not modify this file directly
################################################################################
-import("../../../tint_overrides_with_defaults.gni")
+import("../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/core/BUILD.gn b/src/tint/lang/core/BUILD.gn
index 1bc1f65..fd44935 100644
--- a/src/tint/lang/core/BUILD.gn
+++ b/src/tint/lang/core/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/core/constant/BUILD.gn b/src/tint/lang/core/constant/BUILD.gn
index 4bd0e7b..d468518 100644
--- a/src/tint/lang/core/constant/BUILD.gn
+++ b/src/tint/lang/core/constant/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/core/intrinsic/BUILD.gn b/src/tint/lang/core/intrinsic/BUILD.gn
index 9887ec7..4e55311 100644
--- a/src/tint/lang/core/intrinsic/BUILD.gn
+++ b/src/tint/lang/core/intrinsic/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/core/intrinsic/data/BUILD.gn b/src/tint/lang/core/intrinsic/data/BUILD.gn
index 8bd7df7..3673b17 100644
--- a/src/tint/lang/core/intrinsic/data/BUILD.gn
+++ b/src/tint/lang/core/intrinsic/data/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/core/ir/BUILD.gn b/src/tint/lang/core/ir/BUILD.gn
index ae23d54..146ea38 100644
--- a/src/tint/lang/core/ir/BUILD.gn
+++ b/src/tint/lang/core/ir/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/core/ir/transform/BUILD.gn b/src/tint/lang/core/ir/transform/BUILD.gn
index bac2a9d..ef85e1a 100644
--- a/src/tint/lang/core/ir/transform/BUILD.gn
+++ b/src/tint/lang/core/ir/transform/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/core/type/BUILD.gn b/src/tint/lang/core/type/BUILD.gn
index 1951a45..2043c2d 100644
--- a/src/tint/lang/core/type/BUILD.gn
+++ b/src/tint/lang/core/type/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/glsl/BUILD.gn b/src/tint/lang/glsl/BUILD.gn
index f55ae69..d8cef06 100644
--- a/src/tint/lang/glsl/BUILD.gn
+++ b/src/tint/lang/glsl/BUILD.gn
@@ -20,6 +20,6 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/glsl/writer/BUILD.gn b/src/tint/lang/glsl/writer/BUILD.gn
index a794c4a..2486ed1 100644
--- a/src/tint/lang/glsl/writer/BUILD.gn
+++ b/src/tint/lang/glsl/writer/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
if (tint_build_glsl_writer) {
diff --git a/src/tint/lang/glsl/writer/ast_printer/BUILD.gn b/src/tint/lang/glsl/writer/ast_printer/BUILD.gn
index dc04db6..83c2ba7 100644
--- a/src/tint/lang/glsl/writer/ast_printer/BUILD.gn
+++ b/src/tint/lang/glsl/writer/ast_printer/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/glsl/writer/common/BUILD.gn b/src/tint/lang/glsl/writer/common/BUILD.gn
index 987dae9..356c9e5 100644
--- a/src/tint/lang/glsl/writer/common/BUILD.gn
+++ b/src/tint/lang/glsl/writer/common/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
if (tint_build_glsl_writer) {
diff --git a/src/tint/lang/hlsl/BUILD.gn b/src/tint/lang/hlsl/BUILD.gn
index f55ae69..d8cef06 100644
--- a/src/tint/lang/hlsl/BUILD.gn
+++ b/src/tint/lang/hlsl/BUILD.gn
@@ -20,6 +20,6 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/hlsl/validate/BUILD.gn b/src/tint/lang/hlsl/validate/BUILD.gn
index 3f92597..5ef229d 100644
--- a/src/tint/lang/hlsl/validate/BUILD.gn
+++ b/src/tint/lang/hlsl/validate/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
if (tint_build_hlsl_writer) {
diff --git a/src/tint/lang/hlsl/writer/BUILD.gn b/src/tint/lang/hlsl/writer/BUILD.gn
index 92240a1..2da7ed1 100644
--- a/src/tint/lang/hlsl/writer/BUILD.gn
+++ b/src/tint/lang/hlsl/writer/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
if (tint_build_hlsl_writer) {
diff --git a/src/tint/lang/hlsl/writer/ast_printer/BUILD.gn b/src/tint/lang/hlsl/writer/ast_printer/BUILD.gn
index 5cd3ffe..2cff88b 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/BUILD.gn
+++ b/src/tint/lang/hlsl/writer/ast_printer/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/hlsl/writer/common/BUILD.gn b/src/tint/lang/hlsl/writer/common/BUILD.gn
index 090c152..6be0ae4 100644
--- a/src/tint/lang/hlsl/writer/common/BUILD.gn
+++ b/src/tint/lang/hlsl/writer/common/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/msl/BUILD.gn b/src/tint/lang/msl/BUILD.gn
index f55ae69..d8cef06 100644
--- a/src/tint/lang/msl/BUILD.gn
+++ b/src/tint/lang/msl/BUILD.gn
@@ -20,6 +20,6 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/msl/validate/BUILD.gn b/src/tint/lang/msl/validate/BUILD.gn
index f8d3377..aea9b68 100644
--- a/src/tint/lang/msl/validate/BUILD.gn
+++ b/src/tint/lang/msl/validate/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
if (tint_build_msl_writer) {
diff --git a/src/tint/lang/msl/writer/BUILD.gn b/src/tint/lang/msl/writer/BUILD.gn
index 4aa676a..adb5332 100644
--- a/src/tint/lang/msl/writer/BUILD.gn
+++ b/src/tint/lang/msl/writer/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
if (tint_build_msl_writer) {
diff --git a/src/tint/lang/msl/writer/ast_printer/BUILD.gn b/src/tint/lang/msl/writer/ast_printer/BUILD.gn
index e7af3d1..5c6fba3 100644
--- a/src/tint/lang/msl/writer/ast_printer/BUILD.gn
+++ b/src/tint/lang/msl/writer/ast_printer/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/msl/writer/common/BUILD.gn b/src/tint/lang/msl/writer/common/BUILD.gn
index 19adb54..b441649 100644
--- a/src/tint/lang/msl/writer/common/BUILD.gn
+++ b/src/tint/lang/msl/writer/common/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/msl/writer/printer/BUILD.gn b/src/tint/lang/msl/writer/printer/BUILD.gn
index e6db342..94851ad 100644
--- a/src/tint/lang/msl/writer/printer/BUILD.gn
+++ b/src/tint/lang/msl/writer/printer/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/msl/writer/raise/BUILD.gn b/src/tint/lang/msl/writer/raise/BUILD.gn
index 6aba461..1108f3e 100644
--- a/src/tint/lang/msl/writer/raise/BUILD.gn
+++ b/src/tint/lang/msl/writer/raise/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/spirv/BUILD.gn b/src/tint/lang/spirv/BUILD.gn
index f55ae69..d8cef06 100644
--- a/src/tint/lang/spirv/BUILD.gn
+++ b/src/tint/lang/spirv/BUILD.gn
@@ -20,6 +20,6 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/spirv/reader/BUILD.gn b/src/tint/lang/spirv/reader/BUILD.gn
index b790b6f..e8bca89 100644
--- a/src/tint/lang/spirv/reader/BUILD.gn
+++ b/src/tint/lang/spirv/reader/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
if (tint_build_spv_reader) {
diff --git a/src/tint/lang/spirv/reader/ast_parser/BUILD.gn b/src/tint/lang/spirv/reader/ast_parser/BUILD.gn
index c747a30..ea640f2 100644
--- a/src/tint/lang/spirv/reader/ast_parser/BUILD.gn
+++ b/src/tint/lang/spirv/reader/ast_parser/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/spirv/reader/common/BUILD.gn b/src/tint/lang/spirv/reader/common/BUILD.gn
index 28449a1..2f2b528 100644
--- a/src/tint/lang/spirv/reader/common/BUILD.gn
+++ b/src/tint/lang/spirv/reader/common/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/spirv/writer/BUILD.gn b/src/tint/lang/spirv/writer/BUILD.gn
index 266f2c9..1e1a21a 100644
--- a/src/tint/lang/spirv/writer/BUILD.gn
+++ b/src/tint/lang/spirv/writer/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/spirv/writer/ast_printer/BUILD.gn b/src/tint/lang/spirv/writer/ast_printer/BUILD.gn
index dd6b36c..fa5fd93 100644
--- a/src/tint/lang/spirv/writer/ast_printer/BUILD.gn
+++ b/src/tint/lang/spirv/writer/ast_printer/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/spirv/writer/common/BUILD.gn b/src/tint/lang/spirv/writer/common/BUILD.gn
index fc9f6b8..2dd5122 100644
--- a/src/tint/lang/spirv/writer/common/BUILD.gn
+++ b/src/tint/lang/spirv/writer/common/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/spirv/writer/printer/BUILD.gn b/src/tint/lang/spirv/writer/printer/BUILD.gn
index 1b53cdb..c6e95b9 100644
--- a/src/tint/lang/spirv/writer/printer/BUILD.gn
+++ b/src/tint/lang/spirv/writer/printer/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
if (tint_build_spv_writer && tint_build_ir) {
diff --git a/src/tint/lang/spirv/writer/raise/BUILD.gn b/src/tint/lang/spirv/writer/raise/BUILD.gn
index 9048926..c47822e 100644
--- a/src/tint/lang/spirv/writer/raise/BUILD.gn
+++ b/src/tint/lang/spirv/writer/raise/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/wgsl/BUILD.gn b/src/tint/lang/wgsl/BUILD.gn
index d01952a..48b3c7a 100644
--- a/src/tint/lang/wgsl/BUILD.gn
+++ b/src/tint/lang/wgsl/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/wgsl/ast/BUILD.gn b/src/tint/lang/wgsl/ast/BUILD.gn
index 0b2f961..47ee72f 100644
--- a/src/tint/lang/wgsl/ast/BUILD.gn
+++ b/src/tint/lang/wgsl/ast/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/wgsl/ast/transform/BUILD.gn b/src/tint/lang/wgsl/ast/transform/BUILD.gn
index 9967047..8df2f94 100644
--- a/src/tint/lang/wgsl/ast/transform/BUILD.gn
+++ b/src/tint/lang/wgsl/ast/transform/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/wgsl/ast/transform/utils/BUILD.gn b/src/tint/lang/wgsl/ast/transform/utils/BUILD.gn
deleted file mode 100644
index eb5be13..0000000
--- a/src/tint/lang/wgsl/ast/transform/utils/BUILD.gn
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2023 The Tint Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-################################################################################
-# File generated by tools/src/cmd/gen
-# using the template:
-# /home/ben/src/dawn/tools/src/cmd/gen/build/BUILD.gn.tmpl
-#
-# Do not modify this file directly
-################################################################################
-
-import("../../../../../../../tint_overrides_with_defaults.gni")
-
-import("${tint_src_dir}/tint.gni")
-
-libtint_source_set("utils") {
- sources = []
- deps = []
-}
-
-tint_unittests_source_set("unittests") {
- sources = []
- deps = []
-}
diff --git a/src/tint/lang/wgsl/helpers/BUILD.gn b/src/tint/lang/wgsl/helpers/BUILD.gn
index edd2d78..9836e13 100644
--- a/src/tint/lang/wgsl/helpers/BUILD.gn
+++ b/src/tint/lang/wgsl/helpers/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/wgsl/inspector/BUILD.gn b/src/tint/lang/wgsl/inspector/BUILD.gn
index 2bbc41a..472f757 100644
--- a/src/tint/lang/wgsl/inspector/BUILD.gn
+++ b/src/tint/lang/wgsl/inspector/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/wgsl/program/BUILD.gn b/src/tint/lang/wgsl/program/BUILD.gn
index 2696ac4..550397b 100644
--- a/src/tint/lang/wgsl/program/BUILD.gn
+++ b/src/tint/lang/wgsl/program/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/wgsl/reader/BUILD.gn b/src/tint/lang/wgsl/reader/BUILD.gn
index 167bc4b..1de5c0d 100644
--- a/src/tint/lang/wgsl/reader/BUILD.gn
+++ b/src/tint/lang/wgsl/reader/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/wgsl/reader/parser/BUILD.gn b/src/tint/lang/wgsl/reader/parser/BUILD.gn
index 1f8d1f0..b7a6ca9 100644
--- a/src/tint/lang/wgsl/reader/parser/BUILD.gn
+++ b/src/tint/lang/wgsl/reader/parser/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/wgsl/reader/program_to_ir/BUILD.gn b/src/tint/lang/wgsl/reader/program_to_ir/BUILD.gn
index 8c9eb93..54696df 100644
--- a/src/tint/lang/wgsl/reader/program_to_ir/BUILD.gn
+++ b/src/tint/lang/wgsl/reader/program_to_ir/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/wgsl/resolver/BUILD.gn b/src/tint/lang/wgsl/resolver/BUILD.gn
index 17f3e73..01da15a 100644
--- a/src/tint/lang/wgsl/resolver/BUILD.gn
+++ b/src/tint/lang/wgsl/resolver/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/wgsl/sem/BUILD.gn b/src/tint/lang/wgsl/sem/BUILD.gn
index 7e23a83..7d8d66b 100644
--- a/src/tint/lang/wgsl/sem/BUILD.gn
+++ b/src/tint/lang/wgsl/sem/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/wgsl/writer/BUILD.gn b/src/tint/lang/wgsl/writer/BUILD.gn
index afe081e..230167b 100644
--- a/src/tint/lang/wgsl/writer/BUILD.gn
+++ b/src/tint/lang/wgsl/writer/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/wgsl/writer/ast_printer/BUILD.gn b/src/tint/lang/wgsl/writer/ast_printer/BUILD.gn
index 337df64..62341ae 100644
--- a/src/tint/lang/wgsl/writer/ast_printer/BUILD.gn
+++ b/src/tint/lang/wgsl/writer/ast_printer/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/wgsl/writer/ir_to_program/BUILD.gn b/src/tint/lang/wgsl/writer/ir_to_program/BUILD.gn
index ae42670..04785fc 100644
--- a/src/tint/lang/wgsl/writer/ir_to_program/BUILD.gn
+++ b/src/tint/lang/wgsl/writer/ir_to_program/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/lang/wgsl/writer/syntax_tree_printer/BUILD.gn b/src/tint/lang/wgsl/writer/syntax_tree_printer/BUILD.gn
index 53c161b..f391618 100644
--- a/src/tint/lang/wgsl/writer/syntax_tree_printer/BUILD.gn
+++ b/src/tint/lang/wgsl/writer/syntax_tree_printer/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../../../tint_overrides_with_defaults.gni")
+import("../../../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/tint.gni b/src/tint/tint.gni
index cafee44..6d6bd8c 100644
--- a/src/tint/tint.gni
+++ b/src/tint/tint.gni
@@ -14,7 +14,7 @@
import("//build_overrides/build.gni")
-import("../../tint_overrides_with_defaults.gni")
+import("../../scripts/tint_overrides_with_defaults.gni")
template("libtint_source_set") {
source_set(target_name) {
diff --git a/src/tint/utils/BUILD.gn b/src/tint/utils/BUILD.gn
index bb2d16f..67e46cc 100644
--- a/src/tint/utils/BUILD.gn
+++ b/src/tint/utils/BUILD.gn
@@ -20,6 +20,6 @@
# Do not modify this file directly
################################################################################
-import("../../../tint_overrides_with_defaults.gni")
+import("../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/cli/BUILD.gn b/src/tint/utils/cli/BUILD.gn
index bff6ce2..c857776 100644
--- a/src/tint/utils/cli/BUILD.gn
+++ b/src/tint/utils/cli/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/command/BUILD.gn b/src/tint/utils/command/BUILD.gn
index 50b6665..53f5b9e 100644
--- a/src/tint/utils/command/BUILD.gn
+++ b/src/tint/utils/command/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/containers/BUILD.gn b/src/tint/utils/containers/BUILD.gn
index e39039b..34a30d1 100644
--- a/src/tint/utils/containers/BUILD.gn
+++ b/src/tint/utils/containers/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/debug/BUILD.gn b/src/tint/utils/debug/BUILD.gn
index 9225c65..975d4d0 100644
--- a/src/tint/utils/debug/BUILD.gn
+++ b/src/tint/utils/debug/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/diagnostic/BUILD.gn b/src/tint/utils/diagnostic/BUILD.gn
index b3c8c28..1ac3aca 100644
--- a/src/tint/utils/diagnostic/BUILD.gn
+++ b/src/tint/utils/diagnostic/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/file/BUILD.gn b/src/tint/utils/file/BUILD.gn
index c53ec89..8c99d8a 100644
--- a/src/tint/utils/file/BUILD.gn
+++ b/src/tint/utils/file/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/generator/BUILD.gn b/src/tint/utils/generator/BUILD.gn
index 89e28fd..08c5b7d 100644
--- a/src/tint/utils/generator/BUILD.gn
+++ b/src/tint/utils/generator/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/ice/BUILD.gn b/src/tint/utils/ice/BUILD.gn
index 2564bb5..c6ea665 100644
--- a/src/tint/utils/ice/BUILD.gn
+++ b/src/tint/utils/ice/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/id/BUILD.gn b/src/tint/utils/id/BUILD.gn
index 5b1cd9d..448ba22 100644
--- a/src/tint/utils/id/BUILD.gn
+++ b/src/tint/utils/id/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/macros/BUILD.gn b/src/tint/utils/macros/BUILD.gn
index bba6052..3ac9b9d 100644
--- a/src/tint/utils/macros/BUILD.gn
+++ b/src/tint/utils/macros/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/math/BUILD.gn b/src/tint/utils/math/BUILD.gn
index 0473ace..02609be 100644
--- a/src/tint/utils/math/BUILD.gn
+++ b/src/tint/utils/math/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/memory/BUILD.gn b/src/tint/utils/memory/BUILD.gn
index 26a27e6..cc0ba0a 100644
--- a/src/tint/utils/memory/BUILD.gn
+++ b/src/tint/utils/memory/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/reflection/BUILD.gn b/src/tint/utils/reflection/BUILD.gn
index c87e03a..10e6be9 100644
--- a/src/tint/utils/reflection/BUILD.gn
+++ b/src/tint/utils/reflection/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/result/BUILD.gn b/src/tint/utils/result/BUILD.gn
index 281030c..6d8a21f 100644
--- a/src/tint/utils/result/BUILD.gn
+++ b/src/tint/utils/result/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/rtti/BUILD.gn b/src/tint/utils/rtti/BUILD.gn
index 3a2d575..bc9e1b4 100644
--- a/src/tint/utils/rtti/BUILD.gn
+++ b/src/tint/utils/rtti/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/strconv/BUILD.gn b/src/tint/utils/strconv/BUILD.gn
index 7a1b26b..c8a7638 100644
--- a/src/tint/utils/strconv/BUILD.gn
+++ b/src/tint/utils/strconv/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/symbol/BUILD.gn b/src/tint/utils/symbol/BUILD.gn
index d598534..a9ad6d6 100644
--- a/src/tint/utils/symbol/BUILD.gn
+++ b/src/tint/utils/symbol/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/templates/BUILD.gn b/src/tint/utils/templates/BUILD.gn
deleted file mode 100644
index 867962a..0000000
--- a/src/tint/utils/templates/BUILD.gn
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2023 The Tint Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-################################################################################
-# File generated by tools/src/cmd/gen
-# using the template:
-# /home/ben/src/dawn/tools/src/cmd/gen/build/BUILD.gn.tmpl
-#
-# Do not modify this file directly
-################################################################################
-
-import("../../../../tint_overrides_with_defaults.gni")
-
-import("${tint_src_dir}/tint.gni")
-
-libtint_source_set("templates") {
- sources = []
- deps = []
-}
-
-tint_unittests_source_set("unittests") {
- sources = []
- deps = []
-}
diff --git a/src/tint/utils/text/BUILD.gn b/src/tint/utils/text/BUILD.gn
index a346d64..ed245cd 100644
--- a/src/tint/utils/text/BUILD.gn
+++ b/src/tint/utils/text/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/src/tint/utils/traits/BUILD.gn b/src/tint/utils/traits/BUILD.gn
index 2ba2b22..969d570 100644
--- a/src/tint/utils/traits/BUILD.gn
+++ b/src/tint/utils/traits/BUILD.gn
@@ -20,7 +20,7 @@
# Do not modify this file directly
################################################################################
-import("../../../../tint_overrides_with_defaults.gni")
+import("../../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")
diff --git a/tools/src/cmd/gen/build/BUILD.gn.tmpl b/tools/src/cmd/gen/build/BUILD.gn.tmpl
index f228a42..0c46af3 100644
--- a/tools/src/cmd/gen/build/BUILD.gn.tmpl
+++ b/tools/src/cmd/gen/build/BUILD.gn.tmpl
@@ -1,5 +1,5 @@
-import("{{Repeat "../" .Depth}}../../../tint_overrides_with_defaults.gni")
+import("{{Repeat "../" .Depth}}../../../scripts/tint_overrides_with_defaults.gni")
import("${tint_src_dir}/tint.gni")