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

Commit ade584ce authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Modify highPriorityDepTag to embed PackagingItemAlwaysDepTag 

To prevent high_priority_deps modules from skip being installed.

Test: m soong_generated_product_filesystem_test
Bug: 376345875
Change-Id: Iec57f3d3f98a8bcceaca41d64c898b93261b1a91
parent d74bf29d

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)