diff options
| author | Wei Li <weiwli@google.com> | 2023-07-13 00:38:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-13 00:38:44 +0000 |
| commit | fab23c7692e37d97143c844b02ec59c0267433d5 (patch) | |
| tree | 33605a37a0c20a48b789133e6f30ff6be3f24b43 | |
| parent | fc5f0418611c0dfb4950f7f7200556f62f49be32 (diff) | |
| parent | b6efc27944b333dcd45c51894c87a02b35f4df91 (diff) | |
| download | bazel-fab23c7692e37d97143c844b02ec59c0267433d5.tar.gz | |
Add columns for static_libraries, whole_static_libraries and am: b6efc27944
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/bazel/+/24029329
Change-Id: I9b3ebc75373313f33a1cd6b3badf069298101f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | rules/apex/apex.bzl | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/rules/apex/apex.bzl b/rules/apex/apex.bzl index be1cf588..d1f2e6d6 100644 --- a/rules/apex/apex.bzl +++ b/rules/apex/apex.bzl @@ -786,12 +786,25 @@ def _generate_sbom(ctx, file_mapping, metadata_file_mapping, apex_file): sbom_metadata_csv = ctx.actions.declare_file(apex_filename + "-sbom-metadata.csv") command = [] metadata_files = [] - command.append("echo installed_file,module_path,soong_module_type,is_prebuilt_make_module,product_copy_files,kernel_module_copy_files,is_platform_generated,build_output_path") - command.append("echo %s,%s,,,,,,%s" % (apex_filename, ctx.label.package, apex_file.path)) + sbom_metadata_csv_columns = [ + "installed_file", + "module_path", + "soong_module_type", + "is_prebuilt_make_module", + "product_copy_files", + "kernel_module_copy_files", + "is_platform_generated", + "build_output_path", + "static_libraries", + "whole_static_libraries", + "is_static_lib", + ] + command.append("echo " + ",".join(sbom_metadata_csv_columns)) + command.append("echo %s,%s,,,,,,%s,,," % (apex_filename, ctx.label.package, apex_file.path)) for installed_file, bazel_output_file in file_mapping.items(): if metadata_file_mapping[installed_file]: metadata_files.append(metadata_file_mapping[installed_file]) - command.append("echo %s,%s,,,,,,%s" % (installed_file, paths.dirname(bazel_output_file.short_path), bazel_output_file.path)) + command.append("echo %s,%s,,,,,,%s,,," % (installed_file, paths.dirname(bazel_output_file.short_path), bazel_output_file.path)) ctx.actions.run_shell( inputs = file_mapping.values(), outputs = [sbom_metadata_csv], |