aboutsummaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorSpandan Das <spandandas@google.com>2023-04-17 19:16:06 +0000
committerSpandan Das <spandandas@google.com>2023-04-17 19:26:03 +0000
commit2dc6dfcb16e5cb25a1a52f9a96e80a51947b3978 (patch)
tree2263211fdaa2c29744d7b56714f71264b2ae2ef4 /android
parent8e6386e0aaaf52097129d12a144ebde52c319a6e (diff)
downloadsoong-2dc6dfcb16e5cb25a1a52f9a96e80a51947b3978.tar.gz
Drop the default apex_available value from BUILD files
If apex_available is missing from Android.bp files, ApexAvailable returns [//apex_available:platform], which is the default. To avoid BUILD file verbosity, remove the build system default value from the generated BUILD files. Bug: 277651159 Test: go test ./bp2build Change-Id: I4129c2a93ac28578f46ebeed49baa23ce727aa1f
Diffstat (limited to 'android')
-rw-r--r--android/mutator.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/android/mutator.go b/android/mutator.go
index 676f8a511..4ec960472 100644
--- a/android/mutator.go
+++ b/android/mutator.go
@@ -747,7 +747,13 @@ func ApexAvailableTags(mod Module) bazel.StringListAttribute {
// TODO(b/218841706): hidl_interface has the apex_available prop, but it's
// defined directly as a prop and not via ApexModule, so this doesn't
// pick those props up.
- attr.Value = ConvertApexAvailableToTags(am.apexModuleBase().ApexAvailable())
+ apexAvailable := am.apexModuleBase().ApexAvailable()
+ // If a user does not specify apex_available in Android.bp, then soong provides a default.
+ // To avoid verbosity of BUILD files, remove this default from user-facing BUILD files.
+ if len(am.apexModuleBase().ApexProperties.Apex_available) == 0 {
+ apexAvailable = []string{}
+ }
+ attr.Value = ConvertApexAvailableToTags(apexAvailable)
}
return attr
}