From 5dfe4be626aa3e453862c31a6742c060c4e39217 Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Thu, 12 Oct 2023 10:16:24 -0400 Subject: Do not convert sdk_version: "none" These also require system_modules to be set. Wait until we convert system_modules to convert sdk_version: "none" Test: CI Change-Id: I5bbdcb6819709a7c5a7932cb860a0de945f3528e --- java/java.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 0594a8b93..1b9941c4e 100644 --- a/java/java.go +++ b/java/java.go @@ -2970,6 +2970,10 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.Bp2buildMutatorContext // TODO(b/297356582): handle core_platform in bp2build ctx.MarkBp2buildUnconvertible(bp2build_metrics_proto.UnconvertedReasonType_PROPERTY_UNSUPPORTED, "sdk_version core_platform") return &javaCommonAttributes{}, &bp2BuildJavaInfo{}, false + } else if proptools.String(m.deviceProperties.Sdk_version) == "none" { + // TODO(b/297356703): handle system_modules + ctx.MarkBp2buildUnconvertible(bp2build_metrics_proto.UnconvertedReasonType_PROPERTY_UNSUPPORTED, "sdk_version none") + return &javaCommonAttributes{}, &bp2BuildJavaInfo{}, false } archVariantProps := m.GetArchVariantProperties(ctx, &CommonProperties{}) -- cgit v1.2.3-59-g8ed1b