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
This commit is contained in:
72
bp2build/java_plugin_conversion_test.go
Normal file
72
bp2build/java_plugin_conversion_test.go
Normal file
@@ -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",
|
||||||
|
]`,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
@@ -14,7 +14,12 @@
|
|||||||
|
|
||||||
package java
|
package java
|
||||||
|
|
||||||
import "android/soong/android"
|
import (
|
||||||
|
"android/soong/android"
|
||||||
|
"android/soong/bazel"
|
||||||
|
|
||||||
|
"github.com/google/blueprint/proptools"
|
||||||
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
registerJavaPluginBuildComponents(android.InitRegistrationContext)
|
registerJavaPluginBuildComponents(android.InitRegistrationContext)
|
||||||
@@ -24,7 +29,6 @@ func registerJavaPluginBuildComponents(ctx android.RegistrationContext) {
|
|||||||
ctx.RegisterModuleType("java_plugin", PluginFactory)
|
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 {
|
func PluginFactory() android.Module {
|
||||||
module := &Plugin{}
|
module := &Plugin{}
|
||||||
|
|
||||||
@@ -32,9 +36,13 @@ func PluginFactory() android.Module {
|
|||||||
module.AddProperties(&module.pluginProperties)
|
module.AddProperties(&module.pluginProperties)
|
||||||
|
|
||||||
InitJavaModule(module, android.HostSupported)
|
InitJavaModule(module, android.HostSupported)
|
||||||
|
|
||||||
|
android.InitBazelModule(module)
|
||||||
|
|
||||||
return 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 {
|
type Plugin struct {
|
||||||
Library
|
Library
|
||||||
|
|
||||||
@@ -50,3 +58,32 @@ type PluginProperties struct {
|
|||||||
// parallelism and cause more recompilation for modules that depend on modules that use this plugin.
|
// parallelism and cause more recompilation for modules that depend on modules that use this plugin.
|
||||||
Generates_api *bool
|
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)
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user