diff options
| author | Yifan Hong <elsk@google.com> | 2022-10-03 09:47:40 -0700 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2022-10-27 16:40:42 -0700 |
| commit | 9f9086cf6f864a796fa1127674b64245f76ba74a (patch) | |
| tree | f9790725fd326e1929df2ac9b0f856b3a9cfbbe2 | |
| parent | ec70fd4cbe516039b1a2504cfcd1662cf7c6616a (diff) | |
| download | build-9f9086cf6f864a796fa1127674b64245f76ba74a.tar.gz | |
kleaf: refactor common constants for MODULES_STAGING_ARCHIVE.
Test: TH
Change-Id: I434bf0933edd3656f5ea59a0edb5c481bb4840f7
Signed-off-by: Yifan Hong <elsk@google.com>
| -rw-r--r-- | kleaf/constants.bzl | 3 | ||||
| -rw-r--r-- | kleaf/impl/constants.bzl | 2 | ||||
| -rw-r--r-- | kleaf/impl/kernel_build.bzl | 3 | ||||
| -rw-r--r-- | kleaf/impl/kernel_filegroup.bzl | 6 |
4 files changed, 11 insertions, 3 deletions
diff --git a/kleaf/constants.bzl b/kleaf/constants.bzl index c0359b0..0b57ac0 100644 --- a/kleaf/constants.bzl +++ b/kleaf/constants.bzl @@ -16,6 +16,7 @@ load( "//build/kernel/kleaf/impl:constants.bzl", "AARCH64_IMAGES", "GKI_ARTIFACTS_AARCH64_OUTS", + "MODULES_STAGING_ARCHIVE", "MODULE_OUTS_FILE_OUTPUT_GROUP", "MODULE_OUTS_FILE_SUFFIX", "SYSTEM_DLKM_OUTS", @@ -77,7 +78,7 @@ GKI_DOWNLOAD_CONFIGS = [ # _modules_prepare "modules_prepare_outdir.tar.gz", # _modules_staging_archive - "modules_staging_dir.tar.gz", + MODULES_STAGING_ARCHIVE, ], }, ] diff --git a/kleaf/impl/constants.bzl b/kleaf/impl/constants.bzl index 96c9a04..e91905a 100644 --- a/kleaf/impl/constants.bzl +++ b/kleaf/impl/constants.bzl @@ -43,3 +43,5 @@ SYSTEM_DLKM_OUTS = [ "system_dlkm_staging_archive.tar.gz", "system_dlkm.modules.load", ] + +MODULES_STAGING_ARCHIVE = "modules_staging_dir.tar.gz" diff --git a/kleaf/impl/kernel_build.bzl b/kleaf/impl/kernel_build.bzl index 0c521ab..809c142 100644 --- a/kleaf/impl/kernel_build.bzl +++ b/kleaf/impl/kernel_build.bzl @@ -35,6 +35,7 @@ load( ) load( ":constants.bzl", + "MODULES_STAGING_ARCHIVE", "MODULE_OUTS_FILE_OUTPUT_GROUP", "MODULE_OUTS_FILE_SUFFIX", "TOOLCHAIN_VERSION_FILENAME", @@ -603,7 +604,7 @@ def _kernel_build_impl(ctx): ) modules_staging_archive = ctx.actions.declare_file( - "{name}/modules_staging_dir.tar.gz".format(name = ctx.label.name), + "{}/{}".format(ctx.label.name, MODULES_STAGING_ARCHIVE), ) out_dir_kernel_headers_tar = ctx.actions.declare_file( "{name}/out-dir-kernel-headers.tar.gz".format(name = ctx.label.name), diff --git a/kleaf/impl/kernel_filegroup.bzl b/kleaf/impl/kernel_filegroup.bzl index 7853bdc..0e4e8e1 100644 --- a/kleaf/impl/kernel_filegroup.bzl +++ b/kleaf/impl/kernel_filegroup.bzl @@ -22,6 +22,10 @@ load( "KernelImagesInfo", "KernelUnstrippedModulesInfo", ) +load( + ":constants.bzl", + "MODULES_STAGING_ARCHIVE", +) load(":debug.bzl", "debug") load( ":utils.bzl", @@ -42,7 +46,7 @@ def _kernel_filegroup_impl(ctx): modules_prepare_deps = [modules_prepare_out_dir_tar_gz] kernel_module_dev_info = KernelBuildExtModuleInfo( - modules_staging_archive = utils.find_file("modules_staging_dir.tar.gz", all_deps, what = ctx.label), + modules_staging_archive = utils.find_file(MODULES_STAGING_ARCHIVE, all_deps, what = ctx.label), modules_prepare_setup = modules_prepare_setup, modules_prepare_deps = modules_prepare_deps, # TODO(b/211515836): module_srcs might also be downloaded |