Use one mutator for all bp2build conversion.
Each conversion required defining a separate mutator, which will each operate on _all_ modules and requires each to repeat checks whether the mutator should operator. Instead, we introduce a single mutator and modules can define a ConvertWithBp2build to implement bp2build conversion for that module. Test: bp2build.sh Bug: 183079158 Change-Id: I99d4b51f441c2903879092c5b56313d606d4338d
This commit is contained in:
19
apex/key.go
19
apex/key.go
@@ -34,8 +34,6 @@ func init() {
|
||||
func registerApexKeyBuildComponents(ctx android.RegistrationContext) {
|
||||
ctx.RegisterModuleType("apex_key", ApexKeyFactory)
|
||||
ctx.RegisterSingletonType("apex_keys_text", apexKeysTextFactory)
|
||||
|
||||
android.RegisterBp2BuildMutator("apex_key", ApexKeyBp2Build)
|
||||
}
|
||||
|
||||
type apexKey struct {
|
||||
@@ -209,20 +207,9 @@ type bazelApexKeyAttributes struct {
|
||||
Private_key bazel.LabelAttribute
|
||||
}
|
||||
|
||||
func ApexKeyBp2Build(ctx android.TopDownMutatorContext) {
|
||||
module, ok := ctx.Module().(*apexKey)
|
||||
if !ok {
|
||||
// Not an APEX key
|
||||
return
|
||||
}
|
||||
if !module.ConvertWithBp2build(ctx) {
|
||||
return
|
||||
}
|
||||
if ctx.ModuleType() != "apex_key" {
|
||||
return
|
||||
}
|
||||
|
||||
apexKeyBp2BuildInternal(ctx, module)
|
||||
// ConvertWithBp2build performs conversion apexKey for bp2build
|
||||
func (m *apexKey) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
|
||||
apexKeyBp2BuildInternal(ctx, m)
|
||||
}
|
||||
|
||||
func apexKeyBp2BuildInternal(ctx android.TopDownMutatorContext, module *apexKey) {
|
||||
|
||||
Reference in New Issue
Block a user