diff options
Diffstat (limited to 'android/early_module_context.go')
| -rw-r--r-- | android/early_module_context.go | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/android/early_module_context.go b/android/early_module_context.go index 300edf194..2c4f97149 100644 --- a/android/early_module_context.go +++ b/android/early_module_context.go @@ -61,7 +61,7 @@ type EarlyModuleContext interface { Errorf(pos scanner.Position, fmt string, args ...interface{}) // OtherModulePropertyErrorf reports an error at the line number of a property in the given module definition. - OtherModulePropertyErrorf(module Module, property, fmt string, args ...interface{}) + OtherModulePropertyErrorf(module ModuleOrProxy, property, fmt string, args ...interface{}) // Failed returns true if any errors have been reported. In most cases the module can continue with generating // build rules after an error, allowing it to report additional errors in a single run, but in cases where the error @@ -98,6 +98,7 @@ type EarlyModuleContext interface { // Namespace returns the Namespace object provided by the NameInterface set by Context.SetNameInterface, or the // default SimpleNameInterface if Context.SetNameInterface was not called. Namespace() *Namespace + OtherModuleNamespace(ModuleOrProxy) *Namespace // HasMutatorFinished returns true if the given mutator has finished running. // It will panic if given an invalid mutator name. @@ -150,7 +151,7 @@ func (e *earlyModuleContext) Config() Config { // If a module builds multiple image variations, provide the generic config only for the core // variant which is installed in the system partition. Other image variant may still read the // original configurations. - if e.Module().base().UseGenericConfig() && e.Module().base().commonProperties.ImageVariation == "" { + if e.Module().UseGenericConfig() && e.Module().base().commonProperties.ImageVariation == "" { return e.EarlyModuleContext.Config().(Config).genericConfig() } return e.EarlyModuleContext.Config().(Config) @@ -188,8 +189,12 @@ func (e *earlyModuleContext) Namespace() *Namespace { return e.EarlyModuleContext.Namespace().(*Namespace) } -func (e *earlyModuleContext) OtherModulePropertyErrorf(module Module, property string, fmt string, args ...interface{}) { - e.EarlyModuleContext.OtherModulePropertyErrorf(getWrappedModule(module), property, fmt, args...) +func (e *earlyModuleContext) OtherModuleNamespace(m ModuleOrProxy) *Namespace { + return e.EarlyModuleContext.OtherModuleNamespace(m).(*Namespace) +} + +func (e *earlyModuleContext) OtherModulePropertyErrorf(module ModuleOrProxy, property string, fmt string, args ...interface{}) { + e.EarlyModuleContext.OtherModulePropertyErrorf(module, property, fmt, args...) } func (e *earlyModuleContext) HasMutatorFinished(mutatorName string) bool { |