diff options
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index aa4b9c8c6..9761e55ec 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -248,6 +248,7 @@ func testApexContext(_ *testing.T, bp string, handlers ...testCustomizer) (*andr cc.RegisterRequiredBuildComponentsForTest(ctx) rust.RegisterRequiredBuildComponentsForTest(ctx) + java.RegisterRequiredBuildComponentsForTest(ctx) ctx.RegisterModuleType("cc_test", cc.TestFactory) ctx.RegisterModuleType("vndk_prebuilt_shared", cc.VndkPrebuiltSharedFactory) @@ -256,14 +257,6 @@ func testApexContext(_ *testing.T, bp string, handlers ...testCustomizer) (*andr ctx.RegisterModuleType("platform_compat_config", java.PlatformCompatConfigFactory) ctx.RegisterModuleType("sh_binary", sh.ShBinaryFactory) ctx.RegisterModuleType("filegroup", android.FileGroupFactory) - java.RegisterJavaBuildComponents(ctx) - java.RegisterSystemModulesBuildComponents(ctx) - java.RegisterAppBuildComponents(ctx) - java.RegisterAppImportBuildComponents(ctx) - java.RegisterAppSetBuildComponents(ctx) - java.RegisterRuntimeResourceOverlayBuildComponents(ctx) - java.RegisterSdkLibraryBuildComponents(ctx) - java.RegisterPrebuiltApisBuildComponents(ctx) ctx.RegisterSingletonType("apex_keys_text", apexKeysTextFactory) ctx.RegisterModuleType("bpf", bpf.BpfFactory) @@ -5957,10 +5950,7 @@ func testDexpreoptWithApexes(t *testing.T, bp, errmsg string, transformDexpreopt ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) android.RegisterPrebuiltMutators(ctx) cc.RegisterRequiredBuildComponentsForTest(ctx) - java.RegisterJavaBuildComponents(ctx) - java.RegisterSystemModulesBuildComponents(ctx) - java.RegisterAppBuildComponents(ctx) - java.RegisterDexpreoptBootJarsComponents(ctx) + java.RegisterRequiredBuildComponentsForTest(ctx) ctx.PostDepsMutators(android.RegisterOverridePostDepsMutators) ctx.PreDepsMutators(RegisterPreDepsMutators) ctx.PostDepsMutators(RegisterPostDepsMutators) @@ -6164,9 +6154,7 @@ func testApexPermittedPackagesRules(t *testing.T, errmsg, bp string, apexBootJar ctx.RegisterModuleType("apex_key", ApexKeyFactory) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) cc.RegisterRequiredBuildComponentsForTest(ctx) - java.RegisterJavaBuildComponents(ctx) - java.RegisterSystemModulesBuildComponents(ctx) - java.RegisterDexpreoptBootJarsComponents(ctx) + java.RegisterRequiredBuildComponentsForTest(ctx) ctx.PostDepsMutators(android.RegisterOverridePostDepsMutators) ctx.PreDepsMutators(RegisterPreDepsMutators) ctx.PostDepsMutators(RegisterPostDepsMutators) |