summaryrefslogtreecommitdiff
path: root/android/namespace_test.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-11-22 15:25:03 -0800
committer Colin Cross <ccross@android.com> 2019-11-25 10:59:44 -0800
commit4b49b768a2cb7d455aea5347d27d9045b8c481fa (patch)
treea8b5167209d668a3c4d97357e00528982d24cc31 /android/namespace_test.go
parent62835fd85fc175f71a9512eedbc0e27cbe2ff30b (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/namespace_test.go')
-rw-r--r--android/namespace_test.go6
1 files changed, 3 insertions, 3 deletions
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)