StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow pre-singleton types to be registered in RegistrationContext" am: ebbf33c42b am: de8121e465 am: ea4ad11547

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1605033

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65bc9e2477dd09b894bef083a857b560376b3090
This commit is contained in:
Paul Duffin
2021-02-24 23:00:14 +00:00
committed by Automerger Merge Worker
parent 6291956ec6 ea4ad11547
commit 1ffd60ae5d
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java_test.go
View File

@@ -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)