From 9bef67488d1fabc0b8341a143eed599dfb80cc5d Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 1 Nov 2023 15:29:09 -0700 Subject: Remove sdkPreSingleton and overlaySingleton These were the only 2 pre-singletons in soong. sdkPreSingleton is totally unused. overlaySingleton can be done during GenerateAndroidBuildActions instead. Test: m nothing --no-skip-soong-tests Change-Id: Ieb5ab92f18cb56be4049c0842f61df8aa02dc52c --- java/java_test.go | 4 ---- 1 file changed, 4 deletions(-) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index c54c0e68f..81119a79e 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -47,10 +47,6 @@ var prepareForJavaTest = android.GroupFixturePreparers( cc.PrepareForTestWithCcBuildComponents, // Include all the default java modules. PrepareForTestWithDexpreopt, - PrepareForTestWithOverlayBuildComponents, - android.FixtureRegisterWithContext(func(ctx android.RegistrationContext) { - ctx.RegisterPreSingletonType("sdk_versions", sdkPreSingletonFactory) - }), ) func TestMain(m *testing.M) { -- cgit v1.2.3-59-g8ed1b