Merge changes I8e4c3f37,I89a32bde

* changes:
  add plugins to javaLibraryAttributes
  convert java_import_host with bp2build; enable jetifier
This commit is contained in:
Sam Delmerico
2022-03-30 21:08:12 +00:00
committed by Gerrit Code Review
3 changed files with 45 additions and 14 deletions

View File

@@ -1725,6 +1725,7 @@ func ImportFactoryHost() android.Module {
android.InitPrebuiltModule(module, &module.properties.Jars)
android.InitApexModule(module)
android.InitBazelModule(module)
InitJavaModule(module, android.HostSupported)
return module
}
@@ -2025,6 +2026,7 @@ func addCLCFromDep(ctx android.ModuleContext, depModule android.Module,
type javaCommonAttributes struct {
Srcs bazel.LabelListAttribute
Plugins bazel.LabelListAttribute
Javacopts bazel.StringListAttribute
}
@@ -2060,6 +2062,9 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
commonAttrs := &javaCommonAttributes{
Srcs: srcPartitions[javaSrcPartition],
Plugins: bazel.MakeLabelListAttribute(
android.BazelLabelForModuleDeps(ctx, m.properties.Plugins),
),
}
if m.properties.Javacflags != nil {