diff options
| author | 2022-02-22 21:41:33 +0000 | |
|---|---|---|
| committer | 2022-03-31 21:00:24 +0000 | |
| commit | 489831660c099a0a7903f1082bb2095b506e5bc0 (patch) | |
| tree | ea8e13ddf9c4278ab8d31f5dc623890975707303 /java/java.go | |
| parent | 76ff96f88584282e89c7d5f8f2e73a35710ab358 (diff) | |
convert java_import jars with arch variants
Bug: 220168131
Test: go test ./bp2build -run TestJavaImport
Test: b build '...'
Change-Id: Ib485e6905e7be9d199af5295b23131c226fd6e96
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 1b6e559b3..ecbbc329c 100644 --- a/java/java.go +++ b/java/java.go @@ -2218,8 +2218,16 @@ type bazelJavaImportAttributes struct { // java_import bp2Build converter. func (i *Import) ConvertWithBp2build(ctx android.TopDownMutatorContext) { - //TODO(b/209577426): Support multiple arch variants - jars := bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrcExcludes(ctx, i.properties.Jars, []string(nil))) + var jars bazel.LabelListAttribute + archVariantProps := i.GetArchVariantProperties(ctx, &ImportProperties{}) + for axis, configToProps := range archVariantProps { + for config, _props := range configToProps { + if archProps, ok := _props.(*ImportProperties); ok { + archJars := android.BazelLabelForModuleSrcExcludes(ctx, archProps.Jars, []string(nil)) + jars.SetSelectValue(axis, config, archJars) + } + } + } attrs := &bazelJavaImportAttributes{ Jars: jars, |