From fde9fb5c9c5e0171177a7ff65afd20097ae1c966 Mon Sep 17 00:00:00 2001 From: Sam Delmerico Date: Fri, 28 Jan 2022 20:53:38 +0000 Subject: [PATCH 1/2] convert java static dependencies This commit enables conversions of java_library_static and adds the static_deps Soong attribute to Bazel deps for all Java libraries. Currently, Soong handles static dependencies for Java differently, and Bp2build may need to address that later (see b/217236083). Bug: 215229742 Test: go test ./bp2build Change-Id: I4f86780c634dca0a2cfb9294084b14e139cc2375 --- android/bazel.go | 15 +++++++++++++-- java/base.go | 3 +-- java/java.go | 16 ++++++++++++++-- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/android/bazel.go b/android/bazel.go index 0940205ec..8e2e3508e 100644 --- a/android/bazel.go +++ b/android/bazel.go @@ -291,7 +291,7 @@ var ( "external/bouncycastle": Bp2BuildDefaultTrue, "external/brotli": Bp2BuildDefaultTrue, "external/conscrypt": Bp2BuildDefaultTrue, - "external/error_prone": Bp2BuildDefaultTrue, + "external/error_prone": Bp2BuildDefaultTrueRecursively, "external/fmtlib": Bp2BuildDefaultTrueRecursively, "external/google-benchmark": Bp2BuildDefaultTrueRecursively, "external/googletest": Bp2BuildDefaultTrueRecursively, @@ -431,8 +431,19 @@ var ( "libprotobuf-internal-protos", // b/210751803, we don't handle path property for filegroups "libprotobuf-internal-python-srcs", // b/210751803, we don't handle path property for filegroups "libprotobuf-java-full", // b/210751803, we don't handle path property for filegroups + "host-libprotobuf-java-full", // b/210751803, we don't handle path property for filegroups "libprotobuf-java-util-full", // b/210751803, we don't handle path property for filegroups - "conscrypt", // b/210751803, we don't handle path property for filegroups + + "conscrypt", // b/210751803, we don't handle path property for filegroups + "conscrypt-for-host", // b/210751803, we don't handle path property for filegroups + + "host-libprotobuf-java-lite", // b/217236083, java_library cannot have deps without srcs + "host-libprotobuf-java-micro", // b/217236083, java_library cannot have deps without srcs + "host-libprotobuf-java-nano", // b/217236083, java_library cannot have deps without srcs + "error_prone_core", // b/217236083, java_library cannot have deps without srcs + "bouncycastle-host", // b/217236083, java_library cannot have deps without srcs + + "apex_manifest_proto_java", // b/215230097, we don't handle .proto files in java_library srcs attribute // python protos "libprotobuf-python", // contains .proto sources diff --git a/java/base.go b/java/base.go index a3eb8de21..42d7733ca 100644 --- a/java/base.go +++ b/java/base.go @@ -1969,7 +1969,7 @@ var _ ModuleWithStem = (*Module)(nil) func (j *Module) ConvertWithBp2build(ctx android.TopDownMutatorContext) { switch ctx.ModuleType() { - case "java_library", "java_library_host": + case "java_library", "java_library_host", "java_library_static": if lib, ok := ctx.Module().(*Library); ok { javaLibraryBp2Build(ctx, lib) } @@ -1978,5 +1978,4 @@ func (j *Module) ConvertWithBp2build(ctx android.TopDownMutatorContext) { javaBinaryHostBp2Build(ctx, binary) } } - } diff --git a/java/java.go b/java/java.go index ca4b3cf41..867045aa0 100644 --- a/java/java.go +++ b/java/java.go @@ -2005,7 +2005,7 @@ type javaLibraryAttributes struct { Javacopts bazel.StringListAttribute } -func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) { +func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext) *javaLibraryAttributes { srcs := bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrcExcludes(ctx, m.properties.Srcs, m.properties.Exclude_srcs)) attrs := &javaLibraryAttributes{ Srcs: srcs, @@ -2015,9 +2015,21 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) { attrs.Javacopts = bazel.MakeStringListAttribute(m.properties.Javacflags) } + var deps bazel.LabelList if m.properties.Libs != nil { - attrs.Deps = bazel.MakeLabelListAttribute(android.BazelLabelForModuleDeps(ctx, m.properties.Libs)) + deps.Append(android.BazelLabelForModuleDeps(ctx, m.properties.Libs)) } + if m.properties.Static_libs != nil { + //TODO(b/217236083) handle static libs similarly to Soong + deps.Append(android.BazelLabelForModuleDeps(ctx, m.properties.Static_libs)) + } + attrs.Deps = bazel.MakeLabelListAttribute(deps) + + return attrs +} + +func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) { + attrs := m.convertLibraryAttrsBp2Build(ctx) props := bazel.BazelTargetModuleProperties{ Rule_class: "java_library", From c06ea03c9e0dfd360011bdf1501078e1970f4116 Mon Sep 17 00:00:00 2001 From: Sam Delmerico Date: Fri, 28 Jan 2022 21:11:03 +0000 Subject: [PATCH 2/2] convert java_plugin with bp2build Also, because java_plugin is only intended to be built for the host platform to make additions to the javac compiler, a compatibility requirement is added to java_plugin that ensure that it is not built for android targets. Bug: 215229742 Test: go test ./bp2build Change-Id: I09902215a9f1e8b14d4de5a51328d08a7a0a4450 --- bp2build/java_plugin_conversion_test.go | 72 +++++++++++++++++++++++++ java/plugin.go | 41 +++++++++++++- 2 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 bp2build/java_plugin_conversion_test.go diff --git a/bp2build/java_plugin_conversion_test.go b/bp2build/java_plugin_conversion_test.go new file mode 100644 index 000000000..ff13bb054 --- /dev/null +++ b/bp2build/java_plugin_conversion_test.go @@ -0,0 +1,72 @@ +// Copyright 2021 Google Inc. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package bp2build + +import ( + "testing" + + "android/soong/android" + "android/soong/java" +) + +func runJavaPluginTestCase(t *testing.T, tc bp2buildTestCase) { + t.Helper() + (&tc).moduleTypeUnderTest = "java_plugin" + (&tc).moduleTypeUnderTestFactory = java.PluginFactory + runBp2BuildTestCase(t, func(ctx android.RegistrationContext) { + ctx.RegisterModuleType("java_library", java.LibraryFactory) + }, tc) +} + +func TestJavaPlugin(t *testing.T) { + runJavaPluginTestCase(t, bp2buildTestCase{ + description: "java_plugin with srcs, libs, static_libs", + blueprint: `java_plugin { + name: "java-plug-1", + srcs: ["a.java", "b.java"], + libs: ["java-lib-1"], + static_libs: ["java-lib-2"], + bazel_module: { bp2build_available: true }, +} + +java_library { + name: "java-lib-1", + srcs: ["b.java"], + bazel_module: { bp2build_available: false }, +} + +java_library { + name: "java-lib-2", + srcs: ["c.java"], + bazel_module: { bp2build_available: false }, +}`, + expectedBazelTargets: []string{ + makeBazelTarget("java_plugin", "java-plug-1", attrNameToString{ + "target_compatible_with": `select({ + "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], + "//conditions:default": [], + })`, + "deps": `[ + ":java-lib-1", + ":java-lib-2", + ]`, + "srcs": `[ + "a.java", + "b.java", + ]`, + }), + }, + }) +} diff --git a/java/plugin.go b/java/plugin.go index 297ac2cb8..f1a5ec451 100644 --- a/java/plugin.go +++ b/java/plugin.go @@ -14,7 +14,12 @@ package java -import "android/soong/android" +import ( + "android/soong/android" + "android/soong/bazel" + + "github.com/google/blueprint/proptools" +) func init() { registerJavaPluginBuildComponents(android.InitRegistrationContext) @@ -24,7 +29,6 @@ func registerJavaPluginBuildComponents(ctx android.RegistrationContext) { ctx.RegisterModuleType("java_plugin", PluginFactory) } -// A java_plugin module describes a host java library that will be used by javac as an annotation processor. func PluginFactory() android.Module { module := &Plugin{} @@ -32,9 +36,13 @@ func PluginFactory() android.Module { module.AddProperties(&module.pluginProperties) InitJavaModule(module, android.HostSupported) + + android.InitBazelModule(module) + return module } +// Plugin describes a java_plugin module, a host java library that will be used by javac as an annotation processor. type Plugin struct { Library @@ -50,3 +58,32 @@ type PluginProperties struct { // parallelism and cause more recompilation for modules that depend on modules that use this plugin. Generates_api *bool } + +type pluginAttributes struct { + *javaLibraryAttributes + Processor_class *string + Target_compatible_with bazel.LabelListAttribute +} + +// ConvertWithBp2build is used to convert android_app to Bazel. +func (p *Plugin) ConvertWithBp2build(ctx android.TopDownMutatorContext) { + libAttrs := p.convertLibraryAttrsBp2Build(ctx) + attrs := &pluginAttributes{ + libAttrs, + nil, + bazel.LabelListAttribute{}, + } + + if p.pluginProperties.Processor_class != nil { + attrs.Processor_class = p.pluginProperties.Processor_class + } + + var enabledProperty bazel.BoolAttribute + enabledProperty.SetSelectValue(bazel.OsConfigurationAxis, android.Android.Name, proptools.BoolPtr(false)) + + props := bazel.BazelTargetModuleProperties{ + Rule_class: "java_plugin", + } + + ctx.CreateBazelTargetModuleWithRestrictions(props, android.CommonAttributes{Name: p.Name()}, attrs, enabledProperty) +}