Revert^2 "Build license metadata files in Soong"
b3264f2090
Change-Id: I5ea5f7e29eb1dbc72b8b30f010006a25f5f72fac
This commit is contained in:
@@ -1230,6 +1230,10 @@ type ModuleBase struct {
|
||||
|
||||
initRcPaths Paths
|
||||
vintfFragmentsPaths Paths
|
||||
|
||||
// set of dependency module:location mappings used to populate the license metadata for
|
||||
// apex containers.
|
||||
licenseInstallMap []string
|
||||
}
|
||||
|
||||
// A struct containing all relevant information about a Bazel target converted via bp2build.
|
||||
@@ -1774,6 +1778,12 @@ func (m *ModuleBase) VintfFragments() Paths {
|
||||
return append(Paths{}, m.vintfFragmentsPaths...)
|
||||
}
|
||||
|
||||
// SetLicenseInstallMap stores the set of dependency module:location mappings for files in an
|
||||
// apex container for use when generation the license metadata file.
|
||||
func (m *ModuleBase) SetLicenseInstallMap(installMap []string) {
|
||||
m.licenseInstallMap = append(m.licenseInstallMap, installMap...)
|
||||
}
|
||||
|
||||
func (m *ModuleBase) generateModuleTarget(ctx ModuleContext) {
|
||||
var allInstalledFiles InstallPaths
|
||||
var allCheckbuildFiles Paths
|
||||
@@ -2049,6 +2059,8 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext)
|
||||
m.installFilesDepSet = newInstallPathsDepSet(m.installFiles, dependencyInstallFiles)
|
||||
m.packagingSpecsDepSet = newPackagingSpecsDepSet(m.packagingSpecs, dependencyPackagingSpecs)
|
||||
|
||||
buildLicenseMetadata(ctx)
|
||||
|
||||
m.buildParams = ctx.buildParams
|
||||
m.ruleParams = ctx.ruleParams
|
||||
m.variables = ctx.variables
|
||||
|
Reference in New Issue
Block a user