Bp2build support for JNI deps of android_app.

Change-Id: I3f934ecb0323129e1bb1eb75527395e39467380d
Bug: 297405812
This commit is contained in:
Romain Jobredeaux
2023-06-12 15:40:35 -04:00
parent 52d1cc334b
commit 947dfa760b
3 changed files with 31 additions and 6 deletions

View File

@@ -1716,6 +1716,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