diff options
| author | 2022-03-30 21:08:12 +0000 | |
|---|---|---|
| committer | 2022-03-30 21:08:12 +0000 | |
| commit | 3c25ab1ac3c942f50b976248c145c8839d1572bb (patch) | |
| tree | ba4f0ef74e3d1035f22e52f4214a449b9941914f /java/java.go | |
| parent | d93afba1e6f9313f171be91b52dec807ccd420af (diff) | |
| parent | 77267c7d9c998ebe8b651bfd0e82edbca21d16eb (diff) | |
Merge changes I8e4c3f37,I89a32bde
* changes:
add plugins to javaLibraryAttributes
convert java_import_host with bp2build; enable jetifier
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 8ae14803f..1b6e559b3 100644 --- a/java/java.go +++ b/java/java.go @@ -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 { |