From 05f487a4cda0fff607ee2f00509647d94cb1400d Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Wed, 18 Oct 2023 20:38:37 +0000 Subject: Revert "Do not convert sdk_version: "none"" Revert submission 2786699-import-sdk-version-none Reason for revert: b/306220520 Reverted changes: /q/submissionid:2786699-import-sdk-version-none Change-Id: I309e269db70d9fedaf010ef44791516392fcb4ea --- java/java.go | 4 ---- 1 file changed, 4 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 1b9941c4e..0594a8b93 100644 --- a/java/java.go +++ b/java/java.go @@ -2970,10 +2970,6 @@ 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