Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9b33f70 authored by Sam Delmerico's avatar Sam Delmerico
Browse files

use CommonAttributes for Tags in protos filegroups 

The Tags attribute is now available in CommonAttributes, and if we use
that one, we won't get errors with conflicting definitions of the
attribute if a global Tags value is added via CommonAttributes.

Test: m bp2build
Change-Id: I422ed817b84e6808ef60fe3599fe84332bc51d8e
parent 80850d86

android/filegroup.go

+5 −3
Original line number Diff line number Diff line
@@ -122,16 +122,18 @@ func (fg *fileGroup) ConvertWithBp2build(ctx TopDownMutatorContext) { 
		if fg.ShouldConvertToProtoLibrary(ctx) {

			// TODO(b/246997908): we can remove this tag if we could figure out a

			// solution for this bug.

			tags := []string{"manual"}

			attrs := &ProtoAttrs{

				Srcs:                srcs,

				Strip_import_prefix: fg.properties.Path,

				Tags:                tags,

			}



			tags := []string{"manual"}

			ctx.CreateBazelTargetModule(

				bazel.BazelTargetModuleProperties{Rule_class: "proto_library"},

				CommonAttributes{Name: fg.Name() + convertedProtoLibrarySuffix},

				CommonAttributes{

					Name: fg.Name() + convertedProtoLibrarySuffix,

					Tags: bazel.MakeStringListAttribute(tags),

				},

				attrs)

		}

android/proto.go

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ type ProtoAttrs struct { 
	Srcs                bazel.LabelListAttribute

	Strip_import_prefix *string

	Deps                bazel.LabelListAttribute

	Tags                []string

}



// For each package in the include_dirs property a proto_library target should