diff options
| author | 2024-08-23 12:06:11 -0700 | |
|---|---|---|
| committer | 2024-09-16 15:10:05 -0700 | |
| commit | 55b56feb869f3217e3395473ae84e03673aea661 (patch) | |
| tree | cee2d66159b53f627652cb3d81bf3bf637ec543b | |
| parent | 0bfceee17855cb2e47e512073d639f797fd31f7b (diff) | |
Add otherModuleProvider to ConfigurableEvaluatorContext
So that it can make decisisons based on a provider set by the
base config mutator.
Bug: 361816274
Test: m nothing
Change-Id: I19e8a9e800dfabcd05740f9c0ed5db833c5b2377
| -rw-r--r-- | android/defaults.go | 1 | ||||
| -rw-r--r-- | android/module.go | 1 | ||||
| -rw-r--r-- | android/paths.go | 1 | ||||
| -rw-r--r-- | android/testing.go | 4 |
4 files changed, 7 insertions, 0 deletions
diff --git a/android/defaults.go b/android/defaults.go index 0d51d9d7c..371106779 100644 --- a/android/defaults.go +++ b/android/defaults.go @@ -101,6 +101,7 @@ func InitDefaultableModule(module DefaultableModule) { // A restricted subset of context methods, similar to LoadHookContext. type DefaultableHookContext interface { EarlyModuleContext + OtherModuleProviderContext CreateModule(ModuleFactory, ...interface{}) Module AddMissingDependencies(missingDeps []string) diff --git a/android/module.go b/android/module.go index dd83d6407..77bdfd6d3 100644 --- a/android/module.go +++ b/android/module.go @@ -2213,6 +2213,7 @@ func (m *ModuleBase) IsNativeBridgeSupported() bool { } type ConfigurableEvaluatorContext interface { + OtherModuleProviderContext Config() Config OtherModulePropertyErrorf(module Module, property string, fmt string, args ...interface{}) HasMutatorFinished(mutatorName string) bool diff --git a/android/paths.go b/android/paths.go index 0a4f89187..0d94f03e6 100644 --- a/android/paths.go +++ b/android/paths.go @@ -91,6 +91,7 @@ func GlobFiles(ctx EarlyModulePathContext, globPattern string, excludes []string // the Path methods that rely on module dependencies having been resolved. type ModuleWithDepsPathContext interface { EarlyModulePathContext + OtherModuleProviderContext VisitDirectDepsBlueprint(visit func(blueprint.Module)) OtherModuleDependencyTag(m blueprint.Module) blueprint.DependencyTag HasMutatorFinished(mutatorName string) bool diff --git a/android/testing.go b/android/testing.go index 1ee6e4cdb..196b22e3e 100644 --- a/android/testing.go +++ b/android/testing.go @@ -1330,6 +1330,10 @@ func (ctx *panickingConfigAndErrorContext) HasMutatorFinished(mutatorName string return ctx.ctx.HasMutatorFinished(mutatorName) } +func (ctx *panickingConfigAndErrorContext) otherModuleProvider(m blueprint.Module, p blueprint.AnyProviderKey) (any, bool) { + return ctx.ctx.otherModuleProvider(m, p) +} + func PanickingConfigAndErrorContext(ctx *TestContext) ConfigurableEvaluatorContext { return &panickingConfigAndErrorContext{ ctx: ctx, |