StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove installFilesDepSet, packagingSpecsDepSet and licenseInstallMap

Browse Source 
from ModuleBase.

The old packagingSpecsDepSet field is kept temporarily to bypass an
auto-merge issue, and will be removed in next change.

Bug: 358425833
Test: CI
Change-Id: I28b4933459c33224f756cc306cabc8088f9be862
This commit is contained in:
Yu Liu
2024-08-21 22:37:35 +00:00
parent 82bf453665
commit bad1eef6d8
6 changed files with 70 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
genrule/genrule.go
View File

@@ -320,7 +320,8 @@ func (g *Module) generateCommonBuildActions(ctx android.ModuleContext) {
ctx.ModuleErrorf("host tool %q missing output file", tool)
return
}
if specs := t.TransitivePackagingSpecs(); specs != nil {
if specs := android.OtherModuleProviderOrDefault(
ctx, t, android.InstallFilesProvider).TransitivePackagingSpecs.ToList(); specs != nil {
// If the HostToolProvider has PackgingSpecs, which are definitions of the
// required relative locations of the tool and its dependencies, use those
// instead. They will be copied to those relative locations in the sbox