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

Merge "Correct bp2build canonical_from_root logic" am: 5ee913f527

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

Change-Id: I374352d470b8d0e351de3b47d5a48f87d4ac40ab
This commit is contained in:
Liz Kammer 2022-02-15 20:57:04 +00:00 committed by Automerger Merge Worker
commit 4902daf52f
5 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/proto.go
View file

@ -187,7 +187,7 @@ func Bp2buildProtoProperties(ctx Bp2buildMutatorContext, module Module, srcs baz
if axis == bazel.NoConfigAxis {
info.Type = props.Proto.Type
if proptools.BoolDefault(props.Proto.Canonical_path_from_root, canonicalPathFromRootDefault) {
if !proptools.BoolDefault(props.Proto.Canonical_path_from_root, canonicalPathFromRootDefault) {
// an empty string indicates to strips the package path
path := ""
attrs.Strip_import_prefix = &path

2
bp2build/cc_binary_conversion_test.go
View file

@ -459,7 +459,6 @@ func TestCcBinarySharedProto(t *testing.T) {
name: "foo",
srcs: ["foo.proto"],
proto: {
canonical_path_from_root: false,
},
include_build_directory: false,
}`,
@ -483,7 +482,6 @@ func TestCcBinaryStaticProto(t *testing.T) {
srcs: ["foo.proto"],
static_executable: true,
proto: {
canonical_path_from_root: false,
},
include_build_directory: false,
}`,

16
bp2build/cc_library_conversion_test.go
View file

@ -1998,8 +1998,7 @@ func TestCcLibraryProtoSimple(t *testing.T) {
}`,
expectedBazelTargets: []string{
makeBazelTarget("proto_library", "foo_proto", attrNameToString{
"srcs": `["foo.proto"]`,
"strip_import_prefix": `""`,
"srcs": `["foo.proto"]`,
}), makeBazelTarget("cc_lite_proto_library", "foo_cc_proto_lite", attrNameToString{
"deps": `[":foo_proto"]`,
}), makeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", attrNameToString{
@ -2024,7 +2023,8 @@ func TestCcLibraryProtoNoCanonicalPathFromRoot(t *testing.T) {
}`,
expectedBazelTargets: []string{
makeBazelTarget("proto_library", "foo_proto", attrNameToString{
"srcs": `["foo.proto"]`,
"srcs": `["foo.proto"]`,
"strip_import_prefix": `""`,
}), makeBazelTarget("cc_lite_proto_library", "foo_cc_proto_lite", attrNameToString{
"deps": `[":foo_proto"]`,
}), makeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", attrNameToString{
@ -2049,8 +2049,7 @@ func TestCcLibraryProtoExplicitCanonicalPathFromRoot(t *testing.T) {
}`,
expectedBazelTargets: []string{
makeBazelTarget("proto_library", "foo_proto", attrNameToString{
"srcs": `["foo.proto"]`,
"strip_import_prefix": `""`,
"srcs": `["foo.proto"]`,
}), makeBazelTarget("cc_lite_proto_library", "foo_cc_proto_lite", attrNameToString{
"deps": `[":foo_proto"]`,
}), makeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", attrNameToString{
@ -2071,7 +2070,6 @@ func TestCcLibraryProtoFull(t *testing.T) {
name: "foo",
srcs: ["foo.proto"],
proto: {
canonical_path_from_root: false,
type: "full",
},
include_build_directory: false,
@ -2099,7 +2097,6 @@ func TestCcLibraryProtoLite(t *testing.T) {
name: "foo",
srcs: ["foo.proto"],
proto: {
canonical_path_from_root: false,
type: "lite",
},
include_build_directory: false,
@ -2127,7 +2124,6 @@ func TestCcLibraryProtoExportHeaders(t *testing.T) {
name: "foo",
srcs: ["foo.proto"],
proto: {
canonical_path_from_root: false,
export_proto_headers: true,
},
include_build_directory: false,
@ -2161,7 +2157,6 @@ cc_library {
name: "a",
srcs: [":a_fg_proto"],
proto: {
canonical_path_from_root: false,
export_proto_headers: true,
},
include_build_directory: false,
@ -2171,7 +2166,6 @@ cc_library {
name: "b",
srcs: [":b_protos"],
proto: {
canonical_path_from_root: false,
export_proto_headers: true,
},
include_build_directory: false,
@ -2181,7 +2175,6 @@ cc_library {
name: "c",
srcs: [":c-proto-srcs"],
proto: {
canonical_path_from_root: false,
export_proto_headers: true,
},
include_build_directory: false,
@ -2191,7 +2184,6 @@ cc_library {
name: "d",
srcs: [":proto-srcs-d"],
proto: {
canonical_path_from_root: false,
export_proto_headers: true,
},
include_build_directory: false,

1
bp2build/cc_library_shared_conversion_test.go
View file

@ -431,7 +431,6 @@ func TestCcLibrarySharedProto(t *testing.T) {
name: "foo",
srcs: ["foo.proto"],
proto: {
canonical_path_from_root: false,
export_proto_headers: true,
},
include_build_directory: false,

1
bp2build/cc_library_static_conversion_test.go
View file

@ -1436,7 +1436,6 @@ func TestCcLibraryStaticProto(t *testing.T) {
name: "foo",
srcs: ["foo.proto"],
proto: {
canonical_path_from_root: false,
export_proto_headers: true,
},
include_build_directory: false,