Merge changes I09902215,I4f86780c (ca1701f5) · Commits · e / os / android_build_soong

android/bazel.go

+13 −2

Original line number	Diff line number	Diff line
		@@ -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-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

bp2build/java_plugin_conversion_test.go

0 → 100644

+72 −0

Original line number	Diff line number	Diff line
		// 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",
		]`,
		}),
		},
		})
		}

java/base.go

+1 −2

Original line number	Diff line number	Diff line
		@@ -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)
		}
		}

		}

java/java.go

+14 −2

Original line number	Diff line number	Diff line
		@@ -2010,7 +2010,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,
		@@ -2020,9 +2020,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",

java/plugin.go

+39 −2

Original line number	Diff line number	Diff line
		@@ -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)
		}