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

Commit 79a70ac6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Modify highPriorityDepTag to embed PackagingItemAlwaysDepTag" into main

parents 837d7f3d ade584ce

android/packaging.go

+3 −3
Original line number Diff line number Diff line
@@ -410,9 +410,9 @@ func (PackagingItemAlwaysDepTag) IsPackagingItem() bool { 
	return true

}



// highPriorityDepTag provides default implementation of HighPriorityPackagingItem interface.

type highPriorityDepTag struct {

	blueprint.DependencyTag

	blueprint.BaseDependencyTag

	PackagingItemAlwaysDepTag

}



// See PackageModule.AddDeps
@@ -433,7 +433,7 @@ func (p *PackagingBase) AddDeps(ctx BottomUpMutatorContext, depTag blueprint.Dep 
		}

		depTagToUse := depTag

		if highPriority {

			depTagToUse = highPriorityDepTag{depTag}

			depTagToUse = highPriorityDepTag{}

		}



		ctx.AddFarVariationDependencies(targetVariation, depTagToUse, dep)