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

Merge "refactor android_app bp2build"

Browse Source
This commit is contained in:
Alix Espino
2023-02-06 19:13:02 +00:00
committed by Gerrit Code Review
parent ee46ca29c4 733110e745
commit ade518ad6e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/app.go
View File

@@ -1524,7 +1524,6 @@ func (a *AndroidApp) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
appAttrs.javaCommonAttributes = commonAttrs appAttrs.javaCommonAttributes = commonAttrs
appAttrs.bazelAapt = aapt appAttrs.bazelAapt = aapt
appAttrs.Deps = deps appAttrs.Deps = deps
ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: a.Name()}, appAttrs)
} else { } else {
ktName := a.Name() + "_kt" ktName := a.Name() + "_kt"
commonAttrs.Common_srcs = bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, a.properties.Common_srcs)) commonAttrs.Common_srcs = bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, a.properties.Common_srcs))
@@ -1545,11 +1544,12 @@ func (a *AndroidApp) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
appAttrs.bazelAapt = &bazelAapt{Manifest: aapt.Manifest} appAttrs.bazelAapt = &bazelAapt{Manifest: aapt.Manifest}
appAttrs.Deps = bazel.MakeSingleLabelListAttribute(bazel.Label{Label: ":" + ktName}) appAttrs.Deps = bazel.MakeSingleLabelListAttribute(bazel.Label{Label: ":" + ktName})
ctx.CreateBazelTargetModule(
props,
android.CommonAttributes{Name: a.Name()},
appAttrs,
)
} }
ctx.CreateBazelTargetModule(
props,
android.CommonAttributes{Name: a.Name()},
appAttrs,
)
} }