diff options
Diffstat (limited to 'java/java_test.go')
-rw-r--r-- | java/java_test.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/java/java_test.go b/java/java_test.go index 1f259627e..157dea16d 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -85,15 +85,8 @@ func testContext() *android.TestContext { ctx.RegisterPreSingletonType("sdk_versions", android.SingletonFactoryAdaptor(sdkPreSingletonFactory)) // Register module types and mutators from cc needed for JNI testing - ctx.RegisterModuleType("cc_library", cc.LibraryFactory) - ctx.RegisterModuleType("cc_object", cc.ObjectFactory) - ctx.RegisterModuleType("toolchain_library", cc.ToolchainLibraryFactory) - ctx.RegisterModuleType("llndk_library", cc.LlndkLibraryFactory) + cc.RegisterRequiredBuildComponentsForTest(ctx) ctx.RegisterModuleType("ndk_prebuilt_shared_stl", cc.NdkPrebuiltSharedStlFactory) - ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) { - ctx.BottomUp("link", cc.LinkageMutator).Parallel() - ctx.BottomUp("begin", cc.BeginMutator).Parallel() - }) return ctx } |