diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-14 01:30:40 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-14 01:30:40 +0000 |
commit | 08d33ee82cec685686e57b11530feae9914e8912 (patch) | |
tree | 33605a37a0c20a48b789133e6f30ff6be3f24b43 | |
parent | a6d296bf1f192a5f2e4ce2c073f81a4bda890f4e (diff) | |
parent | b02aa8f6f4821e5f3514ce4fd2369944cab117d8 (diff) | |
download | bazel-android14-platform-release.tar.gz |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24029329'] into udc-release.android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r9android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-platform-14.0.0_r8android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-release
Change-Id: I66c57b685c4fac9edba8dbe5f1ca86aecb85261d
-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], |