Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05f487a4 authored by Liz Kammer's avatar Liz Kammer Committed by Gerrit Code Review
Browse files

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
parent 5dfe4be6

java/java.go

+0 −4
Original line number Diff line number Diff line
@@ -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{})