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

Merge changes from topic "revert-1899703-AMWIVCREEV"

Browse Source 
* changes:
  Revert "Build license metadata files in Soong"
  Revert "Add dependency license annotations"
This commit is contained in:
Colin Cross
2021-12-10 23:04:45 +00:00
committed by Gerrit Code Review
parent b435744fdc b3264f2090
commit 67938c2925
11 changed files with 35 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/androidmk.go
View File

@@ -474,7 +474,6 @@ type fillInEntriesContext interface {
ModuleDir(module blueprint.Module) string
Config() Config
ModuleProvider(module blueprint.Module, provider blueprint.ProviderKey) interface{}
ModuleHasProvider(module blueprint.Module, provider blueprint.ProviderKey) bool
}
func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint.Module) {
@@ -610,11 +609,6 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint
}
}
if ctx.ModuleHasProvider(mod, LicenseMetadataProvider) {
licenseMetadata := ctx.ModuleProvider(mod, LicenseMetadataProvider).(*LicenseMetadataInfo)
a.SetPath("LOCAL_SOONG_LICENSE_METADATA", licenseMetadata.LicenseMetadataPath)
}
extraCtx := &androidMkExtraEntriesContext{
ctx: ctx,
mod: mod,