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

Merge "Bp2build support for JNI deps of android_app." into main am: 1c4048e08d am: 4bc34aa84e am: 5610f9ceb6 am: 6d9298ad44 am: 5eac3091ca

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

Change-Id: I9b715696156db43585687ec516e657bf68e171bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Romain Jobredeaux
2023-09-21 18:41:04 +00:00
committed by Automerger Merge Worker
parent 0551ed240c 5eac3091ca
commit 3aeb6d8a04
3 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/app.go
View File

@@ -1732,6 +1732,20 @@ func convertWithBp2build(ctx android.Bp2buildMutatorContext, a *AndroidApp) (boo
deps := depLabels.Deps
deps.Append(depLabels.StaticDeps)
var jniDeps bazel.LabelListAttribute
archVariantProps := a.GetArchVariantProperties(ctx, &appProperties{})
for axis, configToProps := range archVariantProps {
for config, _props := range configToProps {
if archProps, ok := _props.(*appProperties); ok {
archJniLibs := android.BazelLabelForModuleDeps(
ctx,
android.LastUniqueStrings(android.CopyOf(archProps.Jni_libs)))
jniDeps.SetSelectValue(axis, config, archJniLibs)
}
}
}
deps.Append(jniDeps)
if !bp2BuildInfo.hasKotlin {
appAttrs.javaCommonAttributes = commonAttrs
appAttrs.bazelAapt = aapt