summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlises Mendez Martinez <umendez@google.com>2022-09-21 00:07:02 +0000
committerUlises Mendez Martinez <umendez@google.com>2022-09-22 17:12:27 +0000
commit28bec492db207f403d08d88886f86dd1e2984089 (patch)
tree68f7f0e9dc8a1c9f33094a420c77385a8fde6859
parent4390841817357d6876ab141b5f4912851fa5ac8f (diff)
downloadbuild-android-gs-raviole-5.10-android13-qpr1-beta-3.tar.gz
Bug: 243136716 Signed-off-by: Ulises Mendez Martinez <umendez@google.com> Change-Id: I08851cd40b250b73f471bcf42a1ad5e9426f896d (cherry picked from commit aa63643d678e6e8e00a297823f3d75e63bb0abb0)
-rw-r--r--kleaf/docs/abi.md4
-rw-r--r--kleaf/impl/abi/abi_dump.bzl4
2 files changed, 5 insertions, 3 deletions
diff --git a/kleaf/docs/abi.md b/kleaf/docs/abi.md
index f481162..da84efe 100644
--- a/kleaf/docs/abi.md
+++ b/kleaf/docs/abi.md
@@ -32,7 +32,9 @@ $ tools/bazel build //common:kernel_aarch64_abi_dump
```
This command extracts the ABI, but does not compare it. This is similar to
-`build/build_abi.sh --nodiff`.
+`ABI_OUT_TAG=generated build/build_abi.sh --nodiff`.
+
+Note: Unlike `build_abi.sh`, the `ABI_OUT_TAG` is always set to `generated`.
### Update the ABI definition {#update-abi}
diff --git a/kleaf/impl/abi/abi_dump.bzl b/kleaf/impl/abi/abi_dump.bzl
index 2b3c213..8583415 100644
--- a/kleaf/impl/abi/abi_dump.bzl
+++ b/kleaf/impl/abi/abi_dump.bzl
@@ -44,7 +44,7 @@ def _abi_dump_epilog_cmd(path, append_version):
def _abi_dump_full(ctx):
abi_linux_tree = utils.intermediates_dir(ctx) + "/abi_linux_tree"
- full_abi_out_file = ctx.actions.declare_file("{}/abi-full.xml".format(ctx.attr.name))
+ full_abi_out_file = ctx.actions.declare_file("{}/abi-full-generated.xml".format(ctx.attr.name))
vmlinux = utils.find_file(name = "vmlinux", files = ctx.files.kernel_build, what = "{}: kernel_build".format(ctx.attr.name), required = True)
unstripped_dir_provider_targets = [ctx.attr.kernel_build] + ctx.attr.kernel_modules
@@ -87,7 +87,7 @@ def _abi_dump_full(ctx):
return full_abi_out_file
def _abi_dump_filtered(ctx, full_abi_out_file):
- abi_out_file = ctx.actions.declare_file("{}/abi.xml".format(ctx.attr.name))
+ abi_out_file = ctx.actions.declare_file("{}/abi-generated.xml".format(ctx.attr.name))
inputs = [full_abi_out_file]
inputs += ctx.attr._hermetic_tools[HermeticToolsInfo].deps