diff options
| author | 2023-12-12 00:29:45 +0000 | |
|---|---|---|
| committer | 2023-12-12 00:29:45 +0000 | |
| commit | 5c298e2c362555a2d85d9938ecb48eee2093d42e (patch) | |
| tree | 9f986ae6c311da1d3e17843dc231805583df240e /java/generated_java_library.go | |
| parent | 22620b7331da0c2d02f86149c260ec71f5a59286 (diff) | |
| parent | 8bb537ba9cd1f07f0e7272c3edc26ecdc038517b (diff) | |
Merge "Remove ConvertWithBp2build implementations" into main am: a72573a727 am: cd4b2f21cd am: 8bb537ba9c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864663
Change-Id: I86ea781dcc4761078a49ee825c47d11fde9d91be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/generated_java_library.go')
| -rw-r--r-- | java/generated_java_library.go | 7 |
1 files changed, 0 insertions, 7 deletions
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) -} |