From 4b49b768a2cb7d455aea5347d27d9045b8c481fa Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 22 Nov 2019 15:25:03 -0800 Subject: 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 --- android/namespace_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'android/namespace_test.go') diff --git a/android/namespace_test.go b/android/namespace_test.go index 20241fe1b..90058e3f5 100644 --- a/android/namespace_test.go +++ b/android/namespace_test.go @@ -637,9 +637,9 @@ func setupTestFromFiles(bps map[string][]byte) (ctx *TestContext, errs []error) ctx = NewTestContext() ctx.MockFileSystem(bps) - ctx.RegisterModuleType("test_module", ModuleFactoryAdaptor(newTestModule)) - ctx.RegisterModuleType("soong_namespace", ModuleFactoryAdaptor(NamespaceFactory)) - ctx.RegisterModuleType("blueprint_test_module", newBlueprintTestModule) + ctx.RegisterModuleType("test_module", newTestModule) + ctx.RegisterModuleType("soong_namespace", NamespaceFactory) + ctx.Context.RegisterModuleType("blueprint_test_module", newBlueprintTestModule) ctx.PreArchMutators(RegisterNamespaceMutator) ctx.PreDepsMutators(func(ctx RegisterMutatorsContext) { ctx.BottomUp("rename", renameMutator) -- cgit v1.2.3-59-g8ed1b