kleaf: unstripped_modules.tar.gz -> variable.

Use a global variable for unstripped modules archive file name
so it can be reused everywhere.

Test: TH
Bug: N/A
Change-Id: I51eac3a35a7dd838905a53b584e9b4046ba8e23c

5 files changed, 13 insertions, 4 deletions

diff --git a/kleaf/impl/constants.bzl b/kleaf/impl/constants.bzl
index 136032f..21b618f 100644
--- a/kleaf/impl/constants.bzl
+++ b/kleaf/impl/constants.bzl
@@ -51,3 +51,5 @@ SYSTEM_DLKM_COMMON_OUTS = [
 MODULES_STAGING_ARCHIVE = "modules_staging_dir.tar.gz"
 
 MODULE_ENV_ARCHIVE_SUFFIX = "_module_env.tar.gz"
+
+UNSTRIPPED_MODULES_ARCHIVE = "unstripped_modules.tar.gz"
diff --git a/kleaf/impl/kernel_filegroup.bzl b/kleaf/impl/kernel_filegroup.bzl
index bc7e567..17fe35c 100644
--- a/kleaf/impl/kernel_filegroup.bzl
+++ b/kleaf/impl/kernel_filegroup.bzl
@@ -33,6 +33,7 @@ load(
     ":constants.bzl",
     "MODULES_STAGING_ARCHIVE",
     "TOOLCHAIN_VERSION_FILENAME",
+    "UNSTRIPPED_MODULES_ARCHIVE",
 )
 load(":debug.bzl", "debug")
 load(":hermetic_toolchain.bzl", "hermetic_toolchain")
@@ -124,7 +125,7 @@ def _kernel_filegroup_impl(ctx):
             break
     if unstripped_modules_info == None:
         # Reverse of kernel_unstripped_modules_archive
-        unstripped_modules_archive = utils.find_file("unstripped_modules.tar.gz", all_deps, what = ctx.label, required = True)
+        unstripped_modules_archive = utils.find_file(UNSTRIPPED_MODULES_ARCHIVE, all_deps, what = ctx.label, required = True)
         unstripped_dir = ctx.actions.declare_directory("{}/unstripped".format(ctx.label.name))
         command = hermetic_tools.setup + """
             tar xf {unstripped_modules_archive} -C $(dirname {unstripped_dir}) $(basename {unstripped_dir})
diff --git a/kleaf/impl/kernel_prebuilt_utils.bzl b/kleaf/impl/kernel_prebuilt_utils.bzl
index 84a925d..71891dd 100644
--- a/kleaf/impl/kernel_prebuilt_utils.bzl
+++ b/kleaf/impl/kernel_prebuilt_utils.bzl
@@ -25,6 +25,7 @@ load(
     "MODULE_OUTS_FILE_SUFFIX",
     "SYSTEM_DLKM_COMMON_OUTS",
     "TOOLCHAIN_VERSION_FILENAME",
+    "UNSTRIPPED_MODULES_ARCHIVE",
 )
 
 visibility("//build/kernel/kleaf/...")
@@ -41,7 +42,7 @@ GKI_DOWNLOAD_CONFIGS = [
     {
         "target_suffix": "unstripped_modules_archive",
         "outs": [
-            "unstripped_modules.tar.gz",
+            UNSTRIPPED_MODULES_ARCHIVE,
         ],
     },
     {
diff --git a/kleaf/impl/kernel_unstripped_modules_archive.bzl b/kleaf/impl/kernel_unstripped_modules_archive.bzl
index c63c2b3..919c769 100644
--- a/kleaf/impl/kernel_unstripped_modules_archive.bzl
+++ b/kleaf/impl/kernel_unstripped_modules_archive.bzl
@@ -18,6 +18,10 @@ load(
     ":common_providers.bzl",
     "KernelUnstrippedModulesInfo",
 )
+load(
+    ":constants.bzl",
+    "UNSTRIPPED_MODULES_ARCHIVE",
+)
 load(":debug.bzl", "debug")
 load(":hermetic_toolchain.bzl", "hermetic_toolchain")
 
@@ -33,7 +37,7 @@ def _kernel_unstripped_modules_archive_impl(ctx):
     directories_depsets += [kernel_module[KernelUnstrippedModulesInfo].directories for kernel_module in ctx.attr.kernel_modules]
     srcs = depset(transitive = directories_depsets, order = "postorder").to_list()
 
-    out_file = ctx.actions.declare_file("{}/unstripped_modules.tar.gz".format(ctx.attr.name))
+    out_file = ctx.actions.declare_file("{}/{}".format(ctx.attr.name, UNSTRIPPED_MODULES_ARCHIVE))
     unstripped_dir = ctx.genfiles_dir.path + "/unstripped"
 
     command = hermetic_tools.setup
diff --git a/kleaf/tests/kernel_build_test/kernel_toolchain_test.bzl b/kleaf/tests/kernel_build_test/kernel_toolchain_test.bzl
index c2daad8..e2ecd13 100644
--- a/kleaf/tests/kernel_build_test/kernel_toolchain_test.bzl
+++ b/kleaf/tests/kernel_build_test/kernel_toolchain_test.bzl
@@ -19,6 +19,7 @@ load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load(
     "//build/kernel/kleaf/impl:constants.bzl",
     "MODULES_STAGING_ARCHIVE",
+    "UNSTRIPPED_MODULES_ARCHIVE",
 )
 load("//build/kernel/kleaf/impl:kernel_build.bzl", "kernel_build")
 load("//build/kernel/kleaf/impl:kernel_filegroup.bzl", "kernel_filegroup")
@@ -76,7 +77,7 @@ def kernel_toolchain_test(name):
         )
         write_file(
             name = filegroup_name + "_unstripped_modules",
-            out = filegroup_name + "_unstripped_modules/unstripped_modules.tar.gz",
+            out = filegroup_name + "_unstripped_modules/" + UNSTRIPPED_MODULES_ARCHIVE,
         )
 
         write_file(