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

Commit 69c65106 authored by Inseob Kim's avatar Inseob Kim
Browse files

Remove SdkVersion condition from image variants 

Image variants must be based on installed partitions. SdkVersion is
orthogonal to image variants. Checking SdkVersion is legacy and it's
causing product modules to be a core variant (incorrectly).

Bug: 370351758
Test: m android_gsi
Change-Id: If496675efa5fe49207ad9c2c32b5e1cddebf1a03
parent 3c0a042d

cc/image.go

+2 −5
Original line number Diff line number Diff line
@@ -179,9 +179,6 @@ type ImageMutatableModule interface { 
	// SnapshotVersion returns the snapshot version for this module.

	SnapshotVersion(mctx android.ImageInterfaceContext) string



	// SdkVersion returns the SDK version for this module.

	SdkVersion() string



	// ExtraVariants returns the list of extra variants this module requires.

	ExtraVariants() []string
@@ -370,7 +367,7 @@ func MutateImage(mctx android.ImageInterfaceContext, m ImageMutatableModule) { 
		if m.HasProductVariant() {

			productVariantNeeded = true

		}

	} else if vendorSpecific && m.SdkVersion() == "" {

	} else if vendorSpecific {

		// This will be available in /vendor (or /odm) only

		vendorVariantNeeded = true

	} else {
@@ -380,7 +377,7 @@ func MutateImage(mctx android.ImageInterfaceContext, m ImageMutatableModule) { 
		coreVariantNeeded = true

	}



	if coreVariantNeeded && productSpecific && m.SdkVersion() == "" {

	if coreVariantNeeded && productSpecific {

		// The module has "product_specific: true" that does not create core variant.

		coreVariantNeeded = false

		productVariantNeeded = true