diff options
| author | 2023-12-12 00:12:54 +0000 | |
|---|---|---|
| committer | 2023-12-12 00:12:54 +0000 | |
| commit | 8bb537ba9cd1f07f0e7272c3edc26ecdc038517b (patch) | |
| tree | 93b3301e9138ed9c18459253f98d45dc7f655959 /java/generated_java_library.go | |
| parent | 316e40373551adb483a14779e1e9f9eb70580311 (diff) | |
| parent | cd4b2f21cd3d015e4e376f7ff8280a1097d8a1e1 (diff) | |
Merge "Remove ConvertWithBp2build implementations" into main am: a72573a727 am: cd4b2f21cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864663
Change-Id: Ibf46aa73b12479533288cf545d5679cdeee29ae2
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) -} |