diff options
author | Wei Li <weiwli@google.com> | 2023-05-24 21:23:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-24 21:23:56 +0000 |
commit | 346aca128d464770d74e5eb132fded4121dbb5e5 (patch) | |
tree | b29c0cdf22352472acebd6223deb592ac4f2e7ec | |
parent | ded709b413f19000bc3d42303642e70e874b9609 (diff) | |
parent | 433d6a4ed41fae28f80265a78979d5bcaace8cb8 (diff) | |
download | bazel-346aca128d464770d74e5eb132fded4121dbb5e5.tar.gz |
Merge "Define macro for declaring package METADATA file." into udc-dev am: 433d6a4ed4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/bazel/+/23337391
Change-Id: I94305b5e51d9315689984739370510596830365b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | rules/apex/BUILD | 7 | ||||
-rw-r--r-- | rules/metadata.bzl | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/rules/apex/BUILD b/rules/apex/BUILD index 3c02fad2..04bb667a 100644 --- a/rules/apex/BUILD +++ b/rules/apex/BUILD @@ -4,6 +4,7 @@ load("@soong_injection//api_levels:platform_versions.bzl", "platform_versions") load("@soong_injection//product_config:product_variables.bzl", "product_vars") load("//build/bazel/flags:common.bzl", "is_env_true") load("//build/bazel/product_variables:constants.bzl", "constants") +load("//build/bazel/rules:metadata.bzl", "metadata") load("//build/bazel/rules/apex:toolchain.bzl", "apex_toolchain") load("//build/bazel/rules/common:api.bzl", "api") load(":apex_aab_test.bzl", "apex_aab_test_suite") @@ -14,11 +15,7 @@ load(":apex_test.bzl", "apex_test_suite") # Setup package and default_metadata_file for _test_apex_sbom in apex_test.bzl package(default_package_metadata = [":default_metadata_file"]) -filegroup( - name = "default_metadata_file", - srcs = ["METADATA"], - applicable_licenses = [], -) +metadata(name = "default_metadata_file") string_setting( name = "apex_name", diff --git a/rules/metadata.bzl b/rules/metadata.bzl index 287905cd..73f6b5b4 100644 --- a/rules/metadata.bzl +++ b/rules/metadata.bzl @@ -17,3 +17,13 @@ MetadataFileInfo = provider( "metadata_file": "METADATA file of a module", }, ) + +# Define metadata file of packages, usually the file is METADATA in the root directory of a package. +# Attribute applicable_licenses is needed on the filegroup, so when the filegroup is used in +# package(default_package_metadata=) Bazel will not regard it as cyclic reference. +def metadata(name, metadata = "METADATA"): + native.filegroup( + name = name, + srcs = [metadata], + applicable_licenses = [], + ) |