Merge "Support empty strings in bp2build"

This commit is contained in:
Liz Kammer
2021-12-02 15:35:10 +00:00
committed by Gerrit Code Review
7 changed files with 57 additions and 28 deletions

View File

@@ -3201,7 +3201,7 @@ type bazelApexBundleAttributes struct {
File_contexts bazel.LabelAttribute
Key bazel.LabelAttribute
Certificate bazel.LabelAttribute
Min_sdk_version string
Min_sdk_version *string
Updatable bazel.BoolAttribute
Installable bazel.BoolAttribute
Native_shared_libs bazel.LabelListAttribute
@@ -3241,9 +3241,9 @@ func apexBundleBp2BuildInternal(ctx android.TopDownMutatorContext, module *apexB
fileContextsLabelAttribute.SetValue(android.BazelLabelForModuleDepSingle(ctx, *module.properties.File_contexts))
}
var minSdkVersion string
var minSdkVersion *string
if module.properties.Min_sdk_version != nil {
minSdkVersion = *module.properties.Min_sdk_version
minSdkVersion = module.properties.Min_sdk_version
}
var keyLabelAttribute bazel.LabelAttribute