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
This commit is contained in:
Colin Cross
2023-12-07 13:10:56 -08:00
parent e51c6e4109
commit 8ff105860d
168 changed files with 64 additions and 39712 deletions

View File

@@ -19,11 +19,9 @@ import (
"sort"
"strings"
"android/soong/ui/metrics/bp2build_metrics_proto"
"github.com/google/blueprint/proptools"
"android/soong/android"
"android/soong/bazel"
"android/soong/cc"
"android/soong/etc"
)
@@ -54,7 +52,6 @@ type linkerConfigProperties struct {
type linkerConfig struct {
android.ModuleBase
android.BazelModuleBase
properties linkerConfigProperties
outputFilePath android.OutputPath
@@ -103,29 +100,6 @@ func (l *linkerConfig) GenerateAndroidBuildActions(ctx android.ModuleContext) {
ctx.InstallFile(l.installDirPath, l.outputFilePath.Base(), l.outputFilePath)
}
type linkerConfigAttributes struct {
Src bazel.LabelAttribute
}
func (l *linkerConfig) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) {
if l.properties.Src == nil {
ctx.PropertyErrorf("src", "empty src is not supported")
ctx.MarkBp2buildUnconvertible(bp2build_metrics_proto.UnconvertedReasonType_UNSUPPORTED, "")
return
}
src := android.BazelLabelForModuleSrcSingle(ctx, *l.properties.Src)
targetModuleProperties := bazel.BazelTargetModuleProperties{
Rule_class: "linker_config",
Bzl_load_location: "//build/bazel/rules:linker_config.bzl",
}
ctx.CreateBazelTargetModule(
targetModuleProperties,
android.CommonAttributes{Name: l.Name()},
&linkerConfigAttributes{
Src: bazel.LabelAttribute{Value: &src},
})
}
func BuildLinkerConfig(ctx android.ModuleContext, builder *android.RuleBuilder,
input android.Path, otherModules []android.Module, output android.OutputPath) {
@@ -171,7 +145,6 @@ func LinkerConfigFactory() android.Module {
m := &linkerConfig{}
m.AddProperties(&m.properties)
android.InitAndroidArchModule(m, android.HostAndDeviceSupported, android.MultilibFirst)
android.InitBazelModule(m)
return m
}