Merge "Allow pre-singleton types to be registered in RegistrationContext" am: ebbf33c42b
am: de8121e465
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1605033 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8e4a06b96a9754be64cc423b8ac46ceeed461177
This commit is contained in:
@@ -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)
|
||||
|
||||
|
Reference in New Issue
Block a user