diff options
| -rw-r--r-- | android/hooks.go | 84 | ||||
| -rw-r--r-- | android/mutator.go | 1 | ||||
| -rw-r--r-- | android/namespace.go | 1 | ||||
| -rw-r--r-- | android/testing.go | 17 |
4 files changed, 76 insertions, 27 deletions
diff --git a/android/hooks.go b/android/hooks.go index 2a000ceb..04ba69ec 100644 --- a/android/hooks.go +++ b/android/hooks.go @@ -15,7 +15,10 @@ package android import ( + "reflect" + "github.com/google/blueprint" + "github.com/google/blueprint/proptools" ) // This file implements hooks that external module types can use to inject logic into existing @@ -34,21 +37,70 @@ type LoadHookContext interface { } func AddLoadHook(m blueprint.Module, hook func(LoadHookContext)) { - h := &m.(Module).base().hooks - h.load = append(h.load, hook) + blueprint.AddLoadHook(m, func(ctx blueprint.LoadHookContext) { + actx := &loadHookContext{ + earlyModuleContext: m.(Module).base().earlyModuleContextFactory(ctx), + bp: ctx, + } + hook(actx) + }) } -func (x *hooks) runLoadHooks(ctx LoadHookContext, m *ModuleBase) { - if len(x.load) > 0 { - for _, x := range x.load { - x(ctx) - if ctx.Failed() { - return +type loadHookContext struct { + earlyModuleContext + bp blueprint.LoadHookContext + module Module +} + +func (l *loadHookContext) AppendProperties(props ...interface{}) { + for _, p := range props { + err := proptools.AppendMatchingProperties(l.Module().base().customizableProperties, + p, nil) + if err != nil { + if propertyErr, ok := err.(*proptools.ExtendPropertyError); ok { + l.PropertyErrorf(propertyErr.Property, "%s", propertyErr.Err.Error()) + } else { + panic(err) } } } } +func (l *loadHookContext) PrependProperties(props ...interface{}) { + for _, p := range props { + err := proptools.PrependMatchingProperties(l.Module().base().customizableProperties, + p, nil) + if err != nil { + if propertyErr, ok := err.(*proptools.ExtendPropertyError); ok { + l.PropertyErrorf(propertyErr.Property, "%s", propertyErr.Err.Error()) + } else { + panic(err) + } + } + } +} + +func (l *loadHookContext) CreateModule(factory ModuleFactory, props ...interface{}) Module { + inherited := []interface{}{&l.Module().base().commonProperties} + module := l.bp.CreateModule(ModuleFactoryAdaptor(factory), append(inherited, props...)...).(Module) + + if l.Module().base().variableProperties != nil && module.base().variableProperties != nil { + src := l.Module().base().variableProperties + dst := []interface{}{ + module.base().variableProperties, + // Put an empty copy of the src properties into dst so that properties in src that are not in dst + // don't cause a "failed to find property to extend" error. + proptools.CloneEmptyProperties(reflect.ValueOf(src).Elem()).Interface(), + } + err := proptools.AppendMatchingProperties(dst, src, nil) + if err != nil { + panic(err) + } + } + + return module +} + type InstallHookContext interface { ModuleContext Path() InstallPath @@ -94,21 +146,5 @@ func (x *hooks) runInstallHooks(ctx ModuleContext, path InstallPath, symlink boo } type hooks struct { - load []func(LoadHookContext) install []func(InstallHookContext) } - -func registerLoadHookMutator(ctx RegisterMutatorsContext) { - ctx.TopDown("load_hooks", LoadHookMutator).Parallel() -} - -func LoadHookMutator(ctx TopDownMutatorContext) { - if m, ok := ctx.Module().(Module); ok { - m.base().commonProperties.DebugName = ctx.ModuleName() - - // Cast through *topDownMutatorContext because AppendProperties is implemented - // on *topDownMutatorContext but not exposed through TopDownMutatorContext - var loadHookCtx LoadHookContext = ctx.(*topDownMutatorContext) - m.base().hooks.runLoadHooks(loadHookCtx, m.base()) - } -} diff --git a/android/mutator.go b/android/mutator.go index 709d9c09..f2f96639 100644 --- a/android/mutator.go +++ b/android/mutator.go @@ -75,7 +75,6 @@ type RegisterMutatorsContext interface { type RegisterMutatorFunc func(RegisterMutatorsContext) var preArch = []RegisterMutatorFunc{ - registerLoadHookMutator, RegisterNamespaceMutator, // Rename package module types. RegisterPackageRenamer, diff --git a/android/namespace.go b/android/namespace.go index 27ec1635..64ad7e96 100644 --- a/android/namespace.go +++ b/android/namespace.go @@ -185,6 +185,7 @@ func (r *NameResolver) NewModule(ctx blueprint.NamespaceContext, moduleGroup blu if ok { // inform the module whether its namespace is one that we want to export to Make amod.base().commonProperties.NamespaceExportedToMake = ns.exportToKati + amod.base().commonProperties.DebugName = module.Name() } return ns, nil diff --git a/android/testing.go b/android/testing.go index 4f0591b1..6663728e 100644 --- a/android/testing.go +++ b/android/testing.go @@ -37,8 +37,6 @@ func NewTestContext() *TestContext { ctx.SetNameInterface(nameResolver) - ctx.preArch = append(ctx.preArch, registerLoadHookMutator) - ctx.postDeps = append(ctx.postDeps, registerPathDepsMutator) return ctx @@ -54,6 +52,7 @@ type TestContext struct { *Context preArch, preDeps, postDeps []RegisterMutatorFunc NameResolver *NameResolver + config Config } func (ctx *TestContext) PreArchMutators(f RegisterMutatorFunc) { @@ -76,6 +75,20 @@ func (ctx *TestContext) Register(config Config) { registerMutators(ctx.Context.Context, ctx.preArch, ctx.preDeps, ctx.postDeps) ctx.RegisterSingletonType("env", EnvSingleton) + + ctx.config = config +} + +func (ctx *TestContext) ParseFileList(rootDir string, filePaths []string) (deps []string, errs []error) { + // This function adapts the old style ParseFileList calls that are spread throughout the tests + // to the new style that takes a config. + return ctx.Context.ParseFileList(rootDir, filePaths, ctx.config) +} + +func (ctx *TestContext) ParseBlueprintsFiles(rootDir string) (deps []string, errs []error) { + // This function adapts the old style ParseBlueprintsFiles calls that are spread throughout the + // tests to the new style that takes a config. + return ctx.Context.ParseBlueprintsFiles(rootDir, ctx.config) } func (ctx *TestContext) RegisterModuleType(name string, factory ModuleFactory) { |