tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "use CommonAttributes for Tags in protos filegroups" am: dd33a493fb am: 1833a022c9

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2310794

Change-Id: I0cba674c0a56fe8e76d5a9050d3d9d5e19dd02e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-11-22 16:21:01 +00:00 committed by Automerger Merge Worker
commit 81718c7af9
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/filegroup.go
View file

@ -122,16 +122,18 @@ func (fg *fileGroup) ConvertWithBp2build(ctx TopDownMutatorContext) {
if fg.ShouldConvertToProtoLibrary(ctx) { if fg.ShouldConvertToProtoLibrary(ctx) {
// TODO(b/246997908): we can remove this tag if we could figure out a // TODO(b/246997908): we can remove this tag if we could figure out a
// solution for this bug. // solution for this bug.
tags := []string{"manual"}
attrs := &ProtoAttrs{ attrs := &ProtoAttrs{
Srcs: srcs, Srcs: srcs,
Strip_import_prefix: fg.properties.Path, Strip_import_prefix: fg.properties.Path,
Tags: tags,
} }
tags := []string{"manual"}
ctx.CreateBazelTargetModule( ctx.CreateBazelTargetModule(
bazel.BazelTargetModuleProperties{Rule_class: "proto_library"}, bazel.BazelTargetModuleProperties{Rule_class: "proto_library"},
CommonAttributes{Name: fg.Name() + convertedProtoLibrarySuffix}, CommonAttributes{
Name: fg.Name() + convertedProtoLibrarySuffix,
Tags: bazel.MakeStringListAttribute(tags),
},
attrs) attrs)
} }

1
android/proto.go
View file

@ -164,7 +164,6 @@ type ProtoAttrs struct {
Srcs bazel.LabelListAttribute Srcs bazel.LabelListAttribute
Strip_import_prefix *string Strip_import_prefix *string
Deps bazel.LabelListAttribute Deps bazel.LabelListAttribute
Tags []string
} }
// For each package in the include_dirs property a proto_library target should // For each package in the include_dirs property a proto_library target should