Merge "Don't create a new module for bp2build conversion."

This commit is contained in:
Liz Kammer
2021-08-18 19:28:20 +00:00
committed by Gerrit Code Review
16 changed files with 148 additions and 276 deletions

View File

@@ -1385,18 +1385,6 @@ type bazelAndroidAppCertificateAttributes struct {
Certificate string
}
type bazelAndroidAppCertificate struct {
android.BazelTargetModuleBase
bazelAndroidAppCertificateAttributes
}
func BazelAndroidAppCertificateFactory() android.Module {
module := &bazelAndroidAppCertificate{}
module.AddProperties(&module.bazelAndroidAppCertificateAttributes)
android.InitBazelTargetModule(module)
return module
}
func AndroidAppCertificateBp2Build(ctx android.TopDownMutatorContext) {
module, ok := ctx.Module().(*AndroidAppCertificate)
if !ok {
@@ -1428,11 +1416,5 @@ func androidAppCertificateBp2BuildInternal(ctx android.TopDownMutatorContext, mo
Bzl_load_location: "//build/bazel/rules:android_app_certificate.bzl",
}
ctx.CreateBazelTargetModule(BazelAndroidAppCertificateFactory, module.Name(), props, attrs)
ctx.CreateBazelTargetModule(module.Name(), props, attrs)
}
func (m *bazelAndroidAppCertificate) Name() string {
return m.BaseModuleName()
}
func (m *bazelAndroidAppCertificate) GenerateAndroidBuildActions(ctx android.ModuleContext) {}