Implement bp2build converter for rust_protobuf_host (0c4b9ec5) · Commits · e / os / android_build_soong

bp2build/rust_protobuf_conversion_test.go

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		package bp2build

		import (
		"android/soong/android"
		"android/soong/rust"
		"testing"
		)

		func runRustProtobufTestCase(t *testing.T, tc Bp2buildTestCase) {
		t.Helper()
		RunBp2BuildTestCase(t, registerRustProtobufModuleTypes, tc)
		}

		func registerRustProtobufModuleTypes(ctx android.RegistrationContext) {
		ctx.RegisterModuleType("rust_protobuf_host", rust.RustProtobufHostFactory)

		}

		func TestRustProtobufHostTestCase(t *testing.T) {
		runRustProtobufTestCase(t, Bp2buildTestCase{
		Dir: "external/rust/crates/foo",
		Blueprint: "",
		Filesystem: map[string]string{
		"external/rust/crates/foo/src/lib.rs": "",
		"external/rust/crates/foo/src/helper.rs": "",
		"external/rust/crates/foo/Android.bp": `
		rust_protobuf_host {
		name: "libfoo",
		crate_name: "foo",
		protos: ["src/foo.proto"],
		bazel_module: { bp2build_available: true },
		}
		`,
		},
		ExpectedBazelTargets: []string{
		makeBazelTargetHostOrDevice("proto_library", "libfoo_proto", AttrNameToString{
		"srcs": `["src/foo.proto"]`,
		}, android.HostSupported),
		makeBazelTargetHostOrDevice("rust_proto_library", "libfoo", AttrNameToString{
		"crate_name": `"foo"`,
		"deps": `[":libfoo_proto"]`,
		}, android.HostSupported),
		},
		},
		)
		}

rust/protobuf.go

+69 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,9 @@ import (
		"strings"

		"android/soong/android"
		"android/soong/bazel"

		"github.com/google/blueprint/proptools"
		)

		var (
		@@ -264,5 +267,71 @@ func NewRustProtobuf(hod android.HostOrDeviceSupported) (Module, protobufDecor

		module := NewSourceProviderModule(hod, protobuf, false, false)

		android.InitBazelModule(module)

		return module, protobuf
		}

		type rustProtoAttributes struct {
		Srcs bazel.LabelListAttribute
		Crate_name bazel.StringAttribute
		Deps bazel.LabelListAttribute
		}

		type protoLibraryAttributes struct {
		Srcs bazel.LabelListAttribute
		}

		func protoLibraryBp2build(ctx android.TopDownMutatorContext, m *Module) {
		var protoFiles []string

		for _, propsInterface := range m.sourceProvider.SourceProviderProps() {
		if possibleProps, ok := propsInterface.(*ProtobufProperties); ok {
		protoFiles = possibleProps.Protos
		break
		}
		}

		protoLibraryName := m.Name() + "_proto"

		protoDeps := bazel.LabelListAttribute{
		Value: bazel.LabelList{
		Includes: []bazel.Label{
		{
		Label: ":" + protoLibraryName,
		OriginalModuleName: m.Name(),
		},
		},
		},
		}

		ctx.CreateBazelTargetModule(
		bazel.BazelTargetModuleProperties{
		Rule_class: "proto_library",
		},
		android.CommonAttributes{
		Name: protoLibraryName,
		},
		&protoLibraryAttributes{
		Srcs: bazel.MakeLabelListAttribute(
		android.BazelLabelForModuleSrc(ctx, protoFiles),
		),
		},
		)

		ctx.CreateBazelTargetModule(
		bazel.BazelTargetModuleProperties{
		Rule_class: "rust_proto_library",
		Bzl_load_location: "@rules_rust//proto/protobuf:defs.bzl",
		},
		android.CommonAttributes{
		Name: m.Name(),
		},
		&rustProtoAttributes{
		Crate_name: bazel.StringAttribute{
		Value: proptools.StringPtr(m.CrateName()),
		},
		Deps: protoDeps,
		},
		)
		}

rust/rust.go

+2 −0

Original line number	Diff line number	Diff line
		@@ -1852,6 +1852,8 @@ func (m *Module) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
		procMacroBp2build(ctx, m)
		} else if ctx.ModuleType() == "rust_binary_host" {
		binaryBp2build(ctx, m)
		} else if ctx.ModuleType() == "rust_protobuf_host" {
		protoLibraryBp2build(ctx, m)
		} else {
		ctx.MarkBp2buildUnconvertible(bp2build_metrics_proto.UnconvertedReasonType_TYPE_UNSUPPORTED, "")
		}