diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-15 09:17:51 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-15 09:17:51 +0000 |
| commit | 7cd020f16390c8e6e38b6c6e27d8610e86763fd7 (patch) | |
| tree | 74eb7e74af331822a125b7abf070f446ca12d026 | |
| parent | 029666cf06363421ec4c51c1e70287b2499a34fe (diff) | |
| parent | a55b5240524cc9c4d1edb1c7e979978974393768 (diff) | |
| download | bazel-aml_tz5_341510010.tar.gz | |
Snap for 11224086 from a55b5240524cc9c4d1edb1c7e979978974393768 to mainline-tzdata5-releaseaml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz5_341510010
Change-Id: I5c918b5ea881b58e69b309a599cd31570f22dc23
| -rw-r--r-- | ci/target_lists.sh | 2 | ||||
| -rw-r--r-- | rules/apex/apex.bzl | 19 | ||||
| -rw-r--r-- | rules/java/merged_txts.bzl | 2 |
3 files changed, 18 insertions, 5 deletions
diff --git a/ci/target_lists.sh b/ci/target_lists.sh index ecfbe6e6..d1b6cf09 100644 --- a/ci/target_lists.sh +++ b/ci/target_lists.sh @@ -57,7 +57,7 @@ TEST_TARGETS=( HOST_ONLY_TEST_TARGETS=( //tools/trebuchet:AnalyzerKt - //tools/metalava:metalava + //tools/metalava/metalava:metalava # Test both unstripped and stripped versions of a host native unit test //system/core/libcutils:libcutils_test //system/core/libcutils:libcutils_test__test_binary_unstripped 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], diff --git a/rules/java/merged_txts.bzl b/rules/java/merged_txts.bzl index 069903f8..c786055f 100644 --- a/rules/java/merged_txts.bzl +++ b/rules/java/merged_txts.bzl @@ -76,7 +76,7 @@ merged_txts = rule( providers = [JavaSdkLibraryInfo], ), "_metalava": attr.label( - default = "//tools/metalava:metalava", + default = "//tools/metalava/metalava:metalava", executable = True, cfg = "exec", ), |