StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup unused code for bp2build conversion.

Browse Source 
This code to support bp2build-specific modules is no longer necessary as
we do not create bp2build modules after https://r.android.com/1792714

Test: build/bazel/ci/bp2build.sh
Change-Id: I20d3c42f7e3516554cfb537fef05ba40d222dbeb
This commit is contained in:
Liz Kammer
2021-09-07 13:19:21 -04:00
parent c2346f1c21
commit 7cbf7738f2
3 changed files with 3 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
android/module.go
View File

@@ -521,62 +521,6 @@ type Module interface {
TransitivePackagingSpecs() []PackagingSpec
}
// BazelTargetModule is a lightweight wrapper interface around Module for
// bp2build conversion purposes.
//
// In bp2build's bootstrap.Main execution, Soong runs an alternate pipeline of
// mutators that creates BazelTargetModules from regular Module objects,
// performing the mapping from Soong properties to Bazel rule attributes in the
// process. This process may optionally create additional BazelTargetModules,
// resulting in a 1:many mapping.
//
// bp2build.Codegen is then responsible for visiting all modules in the graph,
// filtering for BazelTargetModules, and code-generating BUILD targets from
// them.
type BazelTargetModule interface {
Module
bazelTargetModuleProperties() *bazel.BazelTargetModuleProperties
SetBazelTargetModuleProperties(props bazel.BazelTargetModuleProperties)
RuleClass() string
BzlLoadLocation() string
}
// InitBazelTargetModule is a wrapper function that decorates BazelTargetModule
// with property structs containing metadata for bp2build conversion.
func InitBazelTargetModule(module BazelTargetModule) {
module.AddProperties(module.bazelTargetModuleProperties())
InitAndroidModule(module)
}
// BazelTargetModuleBase contains the property structs with metadata for
// bp2build conversion.
type BazelTargetModuleBase struct {
ModuleBase
Properties bazel.BazelTargetModuleProperties
}
// bazelTargetModuleProperties getter.
func (btmb *BazelTargetModuleBase) bazelTargetModuleProperties() *bazel.BazelTargetModuleProperties {
return &btmb.Properties
}
// SetBazelTargetModuleProperties setter for BazelTargetModuleProperties
func (btmb *BazelTargetModuleBase) SetBazelTargetModuleProperties(props bazel.BazelTargetModuleProperties) {
btmb.Properties = props
}
// RuleClass returns the rule class for this Bazel target
func (b *BazelTargetModuleBase) RuleClass() string {
return b.bazelTargetModuleProperties().Rule_class
}
// BzlLoadLocation returns the rule class for this Bazel target
func (b *BazelTargetModuleBase) BzlLoadLocation() string {
return b.bazelTargetModuleProperties().Bzl_load_location
}
// Qualified id for a module
type qualifiedModuleName struct {
// The package (i.e. directory) in which the module is defined, without trailing /
@@ -987,12 +931,12 @@ const (
DeviceSupported = deviceSupported | deviceDefault
// By default, _only_ device variant is built. Device variant can be disabled with `device_supported: false`
// Host and HostCross are disabled by default and can be enabled with `host_supported: true`
// Host and HostCross are disabled by default and can be enabled with `host_supported: true`
HostAndDeviceSupported = hostSupported | hostCrossSupported | deviceSupported | deviceDefault
// Host, HostCross, and Device are built by default.
// Building Device can be disabled with `device_supported: false`
// Building Host and HostCross can be disabled with `host_supported: false`
// Building Device can be disabled with `device_supported: false`
// Building Host and HostCross can be disabled with `host_supported: false`
HostAndDeviceDefault = hostSupported | hostCrossSupported | hostDefault |
deviceSupported | deviceDefault

5
bp2build/testing.go
View File

@@ -225,11 +225,6 @@ type customBazelModuleAttributes struct {
Arch_paths bazel.LabelListAttribute
}
type customBazelModule struct {
android.BazelTargetModuleBase
customBazelModuleAttributes
}
func customBp2BuildMutator(ctx android.TopDownMutatorContext) {
if m, ok := ctx.Module().(*customModule); ok {
if !m.ConvertWithBp2build(ctx) {

18
cc/library.go
View File

@@ -2341,18 +2341,6 @@ type bazelCcLibraryStaticAttributes struct {
Static staticOrSharedAttributes
}
type bazelCcLibraryStatic struct {
android.BazelTargetModuleBase
bazelCcLibraryStaticAttributes
}
func BazelCcLibraryStaticFactory() android.Module {
module := &bazelCcLibraryStatic{}
module.AddProperties(&module.bazelCcLibraryStaticAttributes)
android.InitBazelTargetModule(module)
return module
}
func ccLibraryStaticBp2BuildInternal(ctx android.TopDownMutatorContext, module *Module) {
compilerAttrs := bp2BuildParseCompilerProps(ctx, module)
linkerAttrs := bp2BuildParseLinkerProps(ctx, module)
@@ -2423,9 +2411,3 @@ func CcLibraryStaticBp2Build(ctx android.TopDownMutatorContext) {
ccLibraryStaticBp2BuildInternal(ctx, module)
}
func (m *bazelCcLibraryStatic) Name() string {
return m.BaseModuleName()
}
func (m *bazelCcLibraryStatic) GenerateAndroidBuildActions(ctx android.ModuleContext) {}