StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support empty strings in bp2build" am: a9351ef6e6 am: 7cb87525ef am: 3044f94f32 am: 8ac1619830

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907331

Change-Id: I510c1b3e833a4d279fea7e2a34d125b6c5e6842d
This commit is contained in:
Liz Kammer
2021-12-02 17:27:12 +00:00
committed by Automerger Merge Worker
parent 3a06f2205c 8ac1619830
commit 01cebf606b
7 changed files with 57 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/apex.go
View File

@@ -3203,7 +3203,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
@@ -3243,9 +3243,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