diff options
| author | 2019-11-22 15:25:03 -0800 | |
|---|---|---|
| committer | 2019-11-25 10:59:44 -0800 | |
| commit | 4b49b768a2cb7d455aea5347d27d9045b8c481fa (patch) | |
| tree | a8b5167209d668a3c4d97357e00528982d24cc31 /android/testing.go | |
| parent | 62835fd85fc175f71a9512eedbc0e27cbe2ff30b (diff) | |
Make TestContext.RegisterModuleType take an android.ModuleFactory
Avoid having to pass ModuleFactoryAdaptor to every call to
RegisterModuleType in a test by wrapping RegisterModuleType.
Test: all soong tests
Change-Id: If8847d16487de0479cc3020b728256922b3cadba
Diffstat (limited to 'android/testing.go')
| -rw-r--r-- | android/testing.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/android/testing.go b/android/testing.go index 447ffd6d4..4b55920c5 100644 --- a/android/testing.go +++ b/android/testing.go @@ -71,7 +71,15 @@ func (ctx *TestContext) PostDepsMutators(f RegisterMutatorFunc) { func (ctx *TestContext) Register() { registerMutators(ctx.Context.Context, ctx.preArch, ctx.preDeps, ctx.postDeps) - ctx.RegisterSingletonType("env", SingletonFactoryAdaptor(EnvSingleton)) + ctx.RegisterSingletonType("env", EnvSingleton) +} + +func (ctx *TestContext) RegisterModuleType(name string, factory ModuleFactory) { + ctx.Context.RegisterModuleType(name, ModuleFactoryAdaptor(factory)) +} + +func (ctx *TestContext) RegisterSingletonType(name string, factory SingletonFactory) { + ctx.Context.RegisterSingletonType(name, SingletonFactoryAdaptor(factory)) } func (ctx *TestContext) ModuleForTests(name, variant string) TestingModule { |