Merge changes from topic "carry_required"

* changes:
  APEX carries required properties of its dependencies
  *RequiredModuleNames functions are available via Module interface
This commit is contained in:
Treehugger Robot
2020-01-07 03:51:29 +00:00
committed by Gerrit Code Review
4 changed files with 86 additions and 3 deletions

View File

@@ -231,6 +231,10 @@ type Module interface {
// Get the visibility rules that control the visibility of this module.
visibility() []string
RequiredModuleNames() []string
HostRequiredModuleNames() []string
TargetRequiredModuleNames() []string
}
// Qualified id for a module
@@ -897,6 +901,18 @@ func (m *ModuleBase) InRecovery() bool {
return m.base().commonProperties.ImageVariation == RecoveryVariation
}
func (m *ModuleBase) RequiredModuleNames() []string {
return m.base().commonProperties.Required
}
func (m *ModuleBase) HostRequiredModuleNames() []string {
return m.base().commonProperties.Host_required
}
func (m *ModuleBase) TargetRequiredModuleNames() []string {
return m.base().commonProperties.Target_required
}
func (m *ModuleBase) generateModuleTarget(ctx ModuleContext) {
allInstalledFiles := Paths{}
allCheckbuildFiles := Paths{}
@@ -1930,15 +1946,15 @@ func (m *moduleContext) ExpandOptionalSource(srcFile *string, prop string) Optio
}
func (m *moduleContext) RequiredModuleNames() []string {
return m.module.base().commonProperties.Required
return m.module.RequiredModuleNames()
}
func (m *moduleContext) HostRequiredModuleNames() []string {
return m.module.base().commonProperties.Host_required
return m.module.HostRequiredModuleNames()
}
func (m *moduleContext) TargetRequiredModuleNames() []string {
return m.module.base().commonProperties.Target_required
return m.module.TargetRequiredModuleNames()
}
func init() {