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 --- python/python_test.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'python/python_test.go') diff --git a/python/python_test.go b/python/python_test.go index e5fe126c1..ba5e7fadc 100644 --- a/python/python_test.go +++ b/python/python_test.go @@ -332,12 +332,9 @@ func TestPythonModule(t *testing.T) { ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) { ctx.BottomUp("version_split", versionSplitMutator()).Parallel() }) - ctx.RegisterModuleType("python_library_host", - android.ModuleFactoryAdaptor(PythonLibraryHostFactory)) - ctx.RegisterModuleType("python_binary_host", - android.ModuleFactoryAdaptor(PythonBinaryHostFactory)) - ctx.RegisterModuleType("python_defaults", - android.ModuleFactoryAdaptor(defaultsFactory)) + ctx.RegisterModuleType("python_library_host", PythonLibraryHostFactory) + ctx.RegisterModuleType("python_binary_host", PythonBinaryHostFactory) + ctx.RegisterModuleType("python_defaults", defaultsFactory) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) ctx.Register() ctx.MockFileSystem(d.mockFiles) -- cgit v1.2.3-59-g8ed1b