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

Merge "Add do not convert for sdk_version unset" into main am: f236cd9247 am: 47059ae7ab am: 0b6b815556 am: ad298c666e am: bf2f95e76b

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

Change-Id: Ia9f66e4bc94e7c2f78c8c161bd13d8b64d18804a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Liz Kammer
2023-08-30 20:14:24 +00:00
committed by Automerger Merge Worker
parent 7966f78f40 bf2f95e76b
commit ee85921902
7 changed files with 315 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java.go
View File

@@ -2905,6 +2905,11 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
var deps bazel.LabelListAttribute
var staticDeps bazel.LabelListAttribute
if proptools.String(m.deviceProperties.Sdk_version) == "" && m.DeviceSupported() {
ctx.MarkBp2buildUnconvertible(bp2build_metrics_proto.UnconvertedReasonType_PROPERTY_UNSUPPORTED, "sdk_version unset")
return &javaCommonAttributes{}, &bp2BuildJavaInfo{}, false
}
archVariantProps := m.GetArchVariantProperties(ctx, &CommonProperties{})
for axis, configToProps := range archVariantProps {
for config, _props := range configToProps {