commit 5ddf42d01f30d9db392aedf2cf7e0f36980c882d
author Aleksei Khoroshilov <akhoroshilov@brave.com> Mon Oct 06 21:51:27 2025 +0700
committer GN LUCI <gn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Oct 07 08:17:14 2025 -0700
tree 131d6997207bcf51677ac0c28818ad986b640f99
parent 81b24e01531ecf0eff12ec9359a555ec3944ec4e

Fix relative imports from args.gn.

Previously, relative imports in args.gn files only worked when GN was
run from the output directory containing the args.gn file. This was
because the source directory for args.gn parsing was set to the current
working directory rather than the directory containing the args.gn file.

Before you had to do:
cd out/dir
gn gen

Now it works correctly with:
gn gen out/dir

Change-Id: I98e18a85b03f10353700b523b1f8e06edc4f915e
Reviewed-on: https://gn-review.googlesource.com/c/gn/+/20000
Commit-Queue: Takuto Ikuta <tikuta@google.com>
Reviewed-by: Takuto Ikuta <tikuta@google.com>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>

src/gn/setup.cc

diff --git a/src/gn/setup.cc b/src/gn/setup.cc
index 4f0fa51..f11dfce 100644
--- a/src/gn/setup.cc
+++ b/src/gn/setup.cc
@@ -625,10 +625,8 @@
   }
 
   Scope arg_scope(&dotfile_settings_);
-  // Set soure dir so relative imports in args work.
-  SourceDir root_source_dir =
-      SourceDirForCurrentDirectory(build_settings_.root_path());
-  arg_scope.set_source_dir(root_source_dir);
+  // Set source dir so relative imports in args work.
+  arg_scope.set_source_dir(args_input_file_->dir());
   args_root_->Execute(&arg_scope, err);
   if (err->has_error()) {
     return false;

src/gn/setup_unittest.cc

diff --git a/src/gn/setup_unittest.cc b/src/gn/setup_unittest.cc
index 082af40..d9ace51 100644
--- a/src/gn/setup_unittest.cc
+++ b/src/gn/setup_unittest.cc
@@ -360,3 +360,53 @@
   EXPECT_FALSE(qux_record->should_generate());
   EXPECT_FALSE(zoo_record->should_generate());
 }
+
+TEST_F(SetupTest, ArgsGnRelativeAndAbsoluteImports) {
+  base::CommandLine cmdline(base::CommandLine::NO_PROGRAM);
+
+  const char kDotfileContents[] = R"(
+    buildconfig = "//BUILDCONFIG.gn"
+    script_executable = ""
+  )";
+
+  // Create a temp directory containing a .gn file and a BUILDCONFIG.gn file,
+  // pass it as --root.
+  base::ScopedTempDir in_temp_dir;
+  ASSERT_TRUE(in_temp_dir.CreateUniqueTempDir());
+  base::FilePath in_path = in_temp_dir.GetPath();
+  base::FilePath dot_gn_name = in_path.Append(FILE_PATH_LITERAL(".gn"));
+  WriteFile(dot_gn_name, kDotfileContents);
+
+  WriteFile(in_path.Append(FILE_PATH_LITERAL("BUILDCONFIG.gn")), "");
+  cmdline.AppendSwitchPath(switches::kRoot, in_path);
+
+  WriteFile(in_path.Append(FILE_PATH_LITERAL("build_defines.gni")),
+            "variable1 = true");
+
+  // Create another temp dir and write the args.gn with imports.
+  base::ScopedTempDir build_temp_dir;
+  ASSERT_TRUE(build_temp_dir.CreateUniqueTempDir());
+  WriteFile(build_temp_dir.GetPath().Append(FILE_PATH_LITERAL("args.gn")), R"(
+    import("//build_defines.gni")
+    import("params.gni")
+  )");
+  WriteFile(build_temp_dir.GetPath().Append(FILE_PATH_LITERAL("params.gni")),
+            "variable2 = true");
+
+  // Run setup and check that the args.gn imports are in dependency files.
+  Setup setup;
+  Err err;
+  EXPECT_TRUE(setup.DoSetupWithErr(FilePathToUTF8(build_temp_dir.GetPath()),
+                                   true, cmdline, &err));
+
+  const auto& dependency_files =
+      setup.build_settings().build_args().build_args_dependency_files();
+  ASSERT_EQ(2u, dependency_files.size());
+  const auto dependency_includes_file = [&](std::string_view file_name) {
+    return std::any_of(
+        dependency_files.begin(), dependency_files.end(),
+        [&](const SourceFile& file) { return file.GetName() == file_name; });
+  };
+  EXPECT_TRUE(dependency_includes_file("build_defines.gni"));
+  EXPECT_TRUE(dependency_includes_file("params.gni"));
+}