diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-03-17 23:54:30 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2021-03-17 23:56:58 +0000 |
| commit | 220ddd7a6bb43368cbdd10f8fef61b0fdbee822d (patch) | |
| tree | f6f178e5f3b91d439cd210fead9237032e0757e3 /java/java_test.go | |
| parent | 803876aaa6b2795329199ed244f7479885194c3c (diff) | |
Clean up java package use of python build components
Bug: 182885307
Test: m nothing
Change-Id: I206ebc075c568a09008ec8b63122922dd87ba318
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 2eb724185..24911b461 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -56,11 +56,10 @@ var javaFixtureFactory = android.NewFixtureFactory( 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) }), @@ -100,11 +99,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) |