diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-11-18 20:00:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-11-18 20:00:31 +0000 |
| commit | b08a091502535777b8229b6aaaed202c703a860d (patch) | |
| tree | 8b572253d98b488f30990376e5a2a66527292a4d /java/java_test.go | |
| parent | 725af86fe75ea266288b389260d42e72cb56a480 (diff) | |
| parent | 95f1ca07ceda4d79468ec9e014db77929472f65a (diff) | |
Merge changes Iba57c949,Ief43ff51,Ib1809a4d,I2ab64f36
* changes:
Store ndkKnownLibs in the config
Register the kythe singleton on the Context instead of globally
Store ninja file deps from PackageVarContext in the config
Store SingletonMakeVarsProviders in the config
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java_test.go b/java/java_test.go index efca03952..845a03a4d 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -92,8 +92,8 @@ func testContext(config android.Config) *android.TestContext { ctx.PreDepsMutators(python.RegisterPythonPreDepsMutators) ctx.PostDepsMutators(android.RegisterOverridePostDepsMutators) - ctx.RegisterPreSingletonType("overlay", android.SingletonFactoryAdaptor(OverlaySingletonFactory)) - ctx.RegisterPreSingletonType("sdk_versions", android.SingletonFactoryAdaptor(sdkPreSingletonFactory)) + ctx.RegisterPreSingletonType("overlay", android.SingletonFactoryAdaptor(ctx.Context, OverlaySingletonFactory)) + ctx.RegisterPreSingletonType("sdk_versions", android.SingletonFactoryAdaptor(ctx.Context, sdkPreSingletonFactory)) android.RegisterPrebuiltMutators(ctx) |