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

Commit dd33a493 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "use CommonAttributes for Tags in protos filegroups"

parents 657ee23d e9b33f70

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