From eafc16bf14f4ccd9779e034b3814b9f1e37d4bd2 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 24 Feb 2021 01:43:18 +0000 Subject: Allow pre-singleton types to be registered in RegistrationContext Bug: 181070625 Test: m droid Change-Id: I708b78ed0b42ec55b0442307f40531cfe1233c2b --- java/java_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index 11f6a7c21..8407f2462 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -74,8 +74,8 @@ func testContext(config android.Config) *android.TestContext { ctx.PreDepsMutators(python.RegisterPythonPreDepsMutators) ctx.PostDepsMutators(android.RegisterOverridePostDepsMutators) - ctx.RegisterPreSingletonType("overlay", android.SingletonFactoryAdaptor(ctx.Context, OverlaySingletonFactory)) - ctx.RegisterPreSingletonType("sdk_versions", android.SingletonFactoryAdaptor(ctx.Context, sdkPreSingletonFactory)) + ctx.RegisterPreSingletonType("overlay", OverlaySingletonFactory) + ctx.RegisterPreSingletonType("sdk_versions", sdkPreSingletonFactory) android.RegisterPrebuiltMutators(ctx) -- cgit v1.2.3-59-g8ed1b