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 --- xml/xml_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xml/xml_test.go') diff --git a/xml/xml_test.go b/xml/xml_test.go index f2a440f9a..0a1156670 100644 --- a/xml/xml_test.go +++ b/xml/xml_test.go @@ -50,8 +50,8 @@ func TestMain(m *testing.M) { func testXml(t *testing.T, bp string) *android.TestContext { config := android.TestArchConfig(buildDir, nil) ctx := android.NewTestArchContext() - ctx.RegisterModuleType("prebuilt_etc", android.ModuleFactoryAdaptor(android.PrebuiltEtcFactory)) - ctx.RegisterModuleType("prebuilt_etc_xml", android.ModuleFactoryAdaptor(PrebuiltEtcXmlFactory)) + ctx.RegisterModuleType("prebuilt_etc", android.PrebuiltEtcFactory) + ctx.RegisterModuleType("prebuilt_etc_xml", PrebuiltEtcXmlFactory) ctx.Register() mockFiles := map[string][]byte{ "Android.bp": []byte(bp), -- cgit v1.2.3-59-g8ed1b