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

Merge "Don't create a new module for bp2build conversion." am: 380dbb9327 am: 680bd2dd0a am: 429f29b360 am: d97dfbe9e6 am: 1637e4345f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1792714

Change-Id: If86018fe24efdb5bbe5cce50bc20b58e0f17ded6
This commit is contained in:
Liz Kammer
2021-08-18 20:32:57 +00:00
committed by Automerger Merge Worker
parent b3f36ebed6 1637e4345f
commit b3d37ab653
16 changed files with 148 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/app.go
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) {}