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

Merge "Re-order android_app bp2build converter logic." into main am: 2195f24ec4 am: 80a3c08c0c am: 0b02d44081 am: 935c1b559f

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

Change-Id: Id3aa31a34e42bcc491c92cd852c471c89752794b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Romain Jobredeaux
2023-09-12 16:52:06 +00:00
committed by Automerger Merge Worker
parent d333324251 935c1b559f
commit 7788da47a1
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/app.go
View File

@@ -1632,15 +1632,6 @@ type bazelAndroidAppAttributes struct {
// ConvertWithBp2build is used to convert android_app to Bazel. // ConvertWithBp2build is used to convert android_app to Bazel.
func (a *AndroidApp) ConvertWithBp2build(ctx android.TopDownMutatorContext) { func (a *AndroidApp) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
commonAttrs, bp2BuildInfo, supported := a.convertLibraryAttrsBp2Build(ctx)
if !supported {
return
}
depLabels := bp2BuildInfo.DepLabels
deps := depLabels.Deps
deps.Append(depLabels.StaticDeps)
aapt, supported := a.convertAaptAttrsWithBp2Build(ctx) aapt, supported := a.convertAaptAttrsWithBp2Build(ctx)
if !supported { if !supported {
return return
@@ -1711,9 +1702,17 @@ func (a *AndroidApp) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
}) })
appAttrs.Proguard_specs.Add(bazel.MakeLabelAttribute(":" + generatedFlagFileRuleName)) appAttrs.Proguard_specs.Add(bazel.MakeLabelAttribute(":" + generatedFlagFileRuleName))
} }
} }
commonAttrs, bp2BuildInfo, supported := a.convertLibraryAttrsBp2Build(ctx)
if !supported {
return
}
depLabels := bp2BuildInfo.DepLabels
deps := depLabels.Deps
deps.Append(depLabels.StaticDeps)
props := bazel.BazelTargetModuleProperties{ props := bazel.BazelTargetModuleProperties{
Rule_class: "android_binary", Rule_class: "android_binary",
Bzl_load_location: "//build/bazel/rules/android:android_binary.bzl", Bzl_load_location: "//build/bazel/rules/android:android_binary.bzl",