diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-12 07:07:27 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-12 07:07:27 +0000 |
| commit | f29e2417ac1123b2eeaf8a684150a05a12334b02 (patch) | |
| tree | a127bc9c4a52f36efcb91c230e932afdb4151e07 | |
| parent | 76a3011236261ce628176ac7876ba3663f34c940 (diff) | |
| parent | 2690277e6d418a2be74d93994a0461fb6eb82c38 (diff) | |
| download | build-f29e2417ac1123b2eeaf8a684150a05a12334b02.tar.gz | |
Snap for 11303529 from 2690277e6d418a2be74d93994a0461fb6eb82c38 to common-android14-6.1-2023-05-exp-release
Change-Id: If9b5b48b54a1bb5f472d82ab0094f94a32ef86e1
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>
| -rw-r--r-- | kleaf/download_repo.bzl | 4 | ||||
| -rw-r--r-- | kleaf/impl/kernel_env.bzl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kleaf/download_repo.bzl b/kleaf/download_repo.bzl index e6660832..c4b24dd8 100644 --- a/kleaf/download_repo.bzl +++ b/kleaf/download_repo.bzl @@ -89,7 +89,7 @@ def _handle_no_build_number(repository_ctx): ERROR: {parent_repo}: No build_number specified. Fix by specifying `--use_prebuilt_gki=<build_number>"`, e.g. bazel build --use_prebuilt_gki={build_number} @{parent_repo}//{filename} """.format( - filename = repository_ctx.attr.filename, + filename = repository_ctx.attr.local_filename, parent_repo = repository_ctx.attr.parent_repo, build_number = SAMPLE_BUILD_NUMBER, ) @@ -105,7 +105,7 @@ Fix by one of the following: --action_env={build_num_var}="{parent_repo}={build_number}" \\ @{parent_repo}//{filename} """.format( - filename = repository_ctx.attr.filename, + filename = repository_ctx.attr.local_filename, parent_repo = repository_ctx.attr.parent_repo, build_number = SAMPLE_BUILD_NUMBER, build_num_var = _BUILD_NUM_ENV_VAR, diff --git a/kleaf/impl/kernel_env.bzl b/kleaf/impl/kernel_env.bzl index 5a7a05dd..a399e64f 100644 --- a/kleaf/impl/kernel_env.bzl +++ b/kleaf/impl/kernel_env.bzl @@ -179,7 +179,7 @@ def _kernel_env_impl(ctx): command += """ export KCONFIG_EXT={kconfig_ext} """.format( - kconfig_ext = kconfig_ext.short_path, + kconfig_ext = kconfig_ext.path, ) if dtstree_makefile: command += """ |