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

Commit 5dfe4be6 authored by Liz Kammer's avatar Liz Kammer
Browse files

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
parent 4e00b092

java/java.go

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