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

Commit d3ba5a3f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Cleanup ImageInterface.SetImageVariation" into main am: 77858402 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131759



Change-Id: I4504623d0978356eb7f3b526d01ffb99abd0da12
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27c00a8b 77858402

android/image.go

+3 −4
Original line number Diff line number Diff line
@@ -44,9 +44,8 @@ type ImageInterface interface { 
	ExtraImageVariations(ctx BaseModuleContext) []string



	// SetImageVariation is called for each newly created image variant. The receiver is the original

	// module, "variation" is the name of the newly created variant and "module" is the newly created

	// variant itself.

	SetImageVariation(ctx BaseModuleContext, variation string, module Module)

	// module, "variation" is the name of the newly created variant. "variation" is set on the receiver.

	SetImageVariation(ctx BaseModuleContext, variation string)

}



const (
@@ -106,7 +105,7 @@ func imageMutator(ctx BottomUpMutatorContext) { 
		mod := ctx.CreateVariations(variations...)

		for i, v := range variations {

			mod[i].base().setImageVariation(v)

			m.SetImageVariation(ctx, v, mod[i])

			mod[i].(ImageInterface).SetImageVariation(ctx, v)

		}

	}

}

bpf/bpf.go

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ func (bpf *bpf) ExtraImageVariations(ctx android.BaseModuleContext) []string { 
	return nil

}



func (bpf *bpf) SetImageVariation(ctx android.BaseModuleContext, variation string, module android.Module) {

func (bpf *bpf) SetImageVariation(ctx android.BaseModuleContext, variation string) {

	bpf.properties.VendorInternal = variation == "vendor"

}

cc/genrule.go

+1 −1
Original line number Diff line number Diff line
@@ -114,5 +114,5 @@ func (g *GenruleExtraProperties) ExtraImageVariations(ctx android.BaseModuleCont 
	return variants

}



func (g *GenruleExtraProperties) SetImageVariation(ctx android.BaseModuleContext, variation string, module android.Module) {

func (g *GenruleExtraProperties) SetImageVariation(ctx android.BaseModuleContext, variation string) {

}

cc/image.go

+13 −14
Original line number Diff line number Diff line
@@ -527,30 +527,29 @@ func squashRamdiskSrcs(m *Module) { 
	}

}



func (c *Module) SetImageVariation(ctx android.BaseModuleContext, variant string, module android.Module) {

	m := module.(*Module)

func (c *Module) SetImageVariation(ctx android.BaseModuleContext, variant string) {

	if variant == android.RamdiskVariation {

		m.MakeAsPlatform()

		squashRamdiskSrcs(m)

		c.MakeAsPlatform()

		squashRamdiskSrcs(c)

	} else if variant == android.VendorRamdiskVariation {

		m.MakeAsPlatform()

		squashVendorRamdiskSrcs(m)

		c.MakeAsPlatform()

		squashVendorRamdiskSrcs(c)

	} else if variant == android.RecoveryVariation {

		m.MakeAsPlatform()

		squashRecoverySrcs(m)

		c.MakeAsPlatform()

		squashRecoverySrcs(c)

	} else if strings.HasPrefix(variant, VendorVariation) {

		m.Properties.ImageVariation = VendorVariation

		c.Properties.ImageVariation = VendorVariation



		if strings.HasPrefix(variant, VendorVariationPrefix) {

			m.Properties.VndkVersion = strings.TrimPrefix(variant, VendorVariationPrefix)

			c.Properties.VndkVersion = strings.TrimPrefix(variant, VendorVariationPrefix)

		}

		squashVendorSrcs(m)

		squashVendorSrcs(c)

	} else if strings.HasPrefix(variant, ProductVariation) {

		m.Properties.ImageVariation = ProductVariation

		c.Properties.ImageVariation = ProductVariation

		if strings.HasPrefix(variant, ProductVariationPrefix) {

			m.Properties.VndkVersion = strings.TrimPrefix(variant, ProductVariationPrefix)

			c.Properties.VndkVersion = strings.TrimPrefix(variant, ProductVariationPrefix)

		}

		squashProductSrcs(m)

		squashProductSrcs(c)

	}



	if c.NeedsVendorPublicLibraryVariants() &&

cc/library_stub.go

+1 −1
Original line number Diff line number Diff line
@@ -511,5 +511,5 @@ func (v *CcApiVariant) ExtraImageVariations(ctx android.BaseModuleContext) []str 


	return variations

}

func (v *CcApiVariant) SetImageVariation(ctx android.BaseModuleContext, variation string, module android.Module) {

func (v *CcApiVariant) SetImageVariation(ctx android.BaseModuleContext, variation string) {

}