diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-03-18 17:02:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-18 17:02:44 +0000 |
| commit | c3f89bece1246e599adbf0232e54f7962277603b (patch) | |
| tree | 4be4c11a12a5841febca22a158da39c3bafb06b2 /java/java_test.go | |
| parent | e410711cd577ac175627c4780f1df87fd8d3f1cf (diff) | |
| parent | 220ddd7a6bb43368cbdd10f8fef61b0fdbee822d (diff) | |
Merge "Clean up java package use of python build components"
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/java/java_test.go b/java/java_test.go index 990e0102e..b68945fd1 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -57,11 +57,10 @@ var javaFixtureFactory = emptyFixtureFactory.Extend( cc.PrepareForTestWithCcBuildComponents, // Include all the default java modules. PrepareForTestWithJavaDefaultModules, + python.PrepareForTestWithPythonBuildComponents, android.FixtureRegisterWithContext(func(ctx android.RegistrationContext) { ctx.RegisterModuleType("java_plugin", PluginFactory) - ctx.RegisterModuleType("python_binary_host", python.PythonBinaryHostFactory) - ctx.PreDepsMutators(python.RegisterPythonPreDepsMutators) ctx.RegisterPreSingletonType("overlay", OverlaySingletonFactory) ctx.RegisterPreSingletonType("sdk_versions", sdkPreSingletonFactory) }), @@ -101,11 +100,9 @@ func testContext(config android.Config) *android.TestContext { RegisterRequiredBuildComponentsForTest(ctx) ctx.RegisterModuleType("java_plugin", PluginFactory) ctx.RegisterModuleType("filegroup", android.FileGroupFactory) - ctx.RegisterModuleType("python_binary_host", python.PythonBinaryHostFactory) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) ctx.PreArchMutators(android.RegisterComponentsMutator) - ctx.PreDepsMutators(python.RegisterPythonPreDepsMutators) ctx.PostDepsMutators(android.RegisterOverridePostDepsMutators) ctx.RegisterPreSingletonType("overlay", OverlaySingletonFactory) ctx.RegisterPreSingletonType("sdk_versions", sdkPreSingletonFactory) |