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

Commit 565cafdc authored Sep 25, 2020 by Colin Cross

Don't create version variations of sdk modules

They are never used, skip creating them.

Test: m checkbuild
Change-Id: I4c8cd544327ae79b781f704be5a9064efdbdf2af

parent 3146c5cd

cc/library.go

+3 −1

Original line number	Diff line number	Diff line
		@@ -1545,14 +1545,16 @@ func CanBeOrLinkAgainstVersionVariants(module interface {
		Host() bool
		InRamdisk() bool
		InRecovery() bool
		UseSdk() bool
		}) bool {
		return !module.Host() && !module.InRamdisk() && !module.InRecovery()
		return !module.Host() && !module.InRamdisk() && !module.InRecovery() && !module.UseSdk()
		}

		func CanBeVersionVariant(module interface {
		Host() bool
		InRamdisk() bool
		InRecovery() bool
		UseSdk() bool
		CcLibraryInterface() bool
		Shared() bool
		Static() bool

rust/rust.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -1053,7 +1053,7 @@ func (mod *Module) DepsMutator(actx android.BottomUpMutatorContext) {
		blueprint.Variation{Mutator: "link", Variation: "static"}),
		cc.StaticDepTag(), deps.StaticLibs...)

		crtVariations := append(cc.GetCrtVariations(ctx, mod), commonDepVariations...)
		crtVariations := cc.GetCrtVariations(ctx, mod)
		if deps.CrtBegin != "" {
		actx.AddVariationDependencies(crtVariations, cc.CrtBeginDepTag, deps.CrtBegin)
		}