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

Merge "Move license module processing to GenerateAndroidBuildActions" am: 12f5d04859 am: d2dea2f249

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699190

Change-Id: Ic0b0ab1b286d9b6389ade952ff99af58fec46be6
This commit is contained in:
Paul Duffin
2021-05-12 15:11:44 +00:00
committed by Automerger Merge Worker
parent 88a0a1da57 d2dea2f249
commit a25390436b
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/license.go
View File

@@ -61,7 +61,17 @@ func (m *licenseModule) DepsMutator(ctx BottomUpMutatorContext) {
} }
func (m *licenseModule) GenerateAndroidBuildActions(ctx ModuleContext) { func (m *licenseModule) GenerateAndroidBuildActions(ctx ModuleContext) {
// Nothing to do. // license modules have no licenses, but license_kinds must refer to license_kind modules
mergeProps(&m.base().commonProperties.Effective_licenses, ctx.ModuleName())
mergeProps(&m.base().commonProperties.Effective_license_text, PathsForModuleSrc(ctx, m.properties.License_text).Strings()...)
for _, module := range ctx.GetDirectDepsWithTag(licenseKindTag) {
if lk, ok := module.(*licenseKindModule); ok {
mergeProps(&m.base().commonProperties.Effective_license_conditions, lk.properties.Conditions...)
mergeProps(&m.base().commonProperties.Effective_license_kinds, ctx.OtherModuleName(module))
} else {
ctx.ModuleErrorf("license_kinds property %q is not a license_kind module", ctx.OtherModuleName(module))
}
}
} }
func LicenseFactory() Module { func LicenseFactory() Module {

15
android/licenses.go
View File

@@ -187,21 +187,6 @@ func licensesPropertyFlattener(ctx ModuleContext) {
return return
} }
// license modules have no licenses, but license_kinds must refer to license_kind modules
if l, ok := m.(*licenseModule); ok {
mergeProps(&m.base().commonProperties.Effective_licenses, ctx.ModuleName())
mergeProps(&m.base().commonProperties.Effective_license_text, PathsForModuleSrc(ctx, l.properties.License_text).Strings()...)
for _, module := range ctx.GetDirectDepsWithTag(licenseKindTag) {
if lk, ok := module.(*licenseKindModule); ok {
mergeProps(&m.base().commonProperties.Effective_license_conditions, lk.properties.Conditions...)
mergeProps(&m.base().commonProperties.Effective_license_kinds, ctx.OtherModuleName(module))
} else {
ctx.ModuleErrorf("license_kinds property %q is not a license_kind module", ctx.OtherModuleName(module))
}
}
return
}
if exemptFromRequiredApplicableLicensesProperty(m) { if exemptFromRequiredApplicableLicensesProperty(m) {
return return
} }