diff options
| author | Liz Kammer <eakammer@google.com> | 2023-08-30 16:59:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-08-30 16:59:50 +0000 |
| commit | f236cd92476745aa86ff5057cce5df66f002110c (patch) | |
| tree | 3f61975c2238ad41cc1308e7f361c54228dceffb /java/java.go | |
| parent | 2860cf1bc829d4e40cc37bc28dec9f08d41e5ec8 (diff) | |
| parent | 02914408de35b650612bc79b392ae37964d29118 (diff) | |
Merge "Add do not convert for sdk_version unset" into main
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 4b01c316d..6c448a2f0 100644 --- a/java/java.go +++ b/java/java.go @@ -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 { |