From 8ff105860d20f2ccbb8d8044bf562f94100b7f6a Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 7 Dec 2023 13:10:56 -0800 Subject: Remove ConvertWithBp2build implementations Remove the ConvertWithBp2build implementations from all the module types, along with the related code. Bug: 315353489 Test: m blueprint_tests Change-Id: I212672286686a318893bc7348ddd5a5ec51e77a7 --- java/generated_java_library.go | 7 ------- 1 file changed, 7 deletions(-) (limited to 'java/generated_java_library.go') diff --git a/java/generated_java_library.go b/java/generated_java_library.go index 930bfd267..40f780c59 100644 --- a/java/generated_java_library.go +++ b/java/generated_java_library.go @@ -35,8 +35,6 @@ type GeneratedJavaLibraryCallbacks interface { // Called from inside GenerateAndroidBuildActions. Add the build rules to // make the srcjar, and return the path to it. GenerateSourceJarBuildActions(module *GeneratedJavaLibraryModule, ctx android.ModuleContext) android.Path - - Bp2build(ctx android.Bp2buildMutatorContext, module *GeneratedJavaLibraryModule) } // GeneratedJavaLibraryModuleFactory provides a utility for modules that are generated @@ -57,7 +55,6 @@ func GeneratedJavaLibraryModuleFactory(moduleName string, callbacks GeneratedJav module.addHostAndDeviceProperties() module.initModuleAndImport(module) android.InitApexModule(module) - android.InitBazelModule(module) InitJavaModule(module, android.HostAndDeviceSupported) if properties != nil { module.AddProperties(properties) @@ -110,7 +107,3 @@ func (module *GeneratedJavaLibraryModule) GenerateAndroidBuildActions(ctx androi module.Library.properties.Generated_srcjars = append(module.Library.properties.Generated_srcjars, srcJarPath) module.Library.GenerateAndroidBuildActions(ctx) } - -func (module *GeneratedJavaLibraryModule) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) { - module.callbacks.Bp2build(ctx, module) -} -- cgit v1.2.3-59-g8ed1b