StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ic3ef7557,If75daf11 am: b3bdf38453

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

Change-Id: I3b9c8a3d4d36cc03b6648b2c7a7b5a10706ec87d
This commit is contained in:
Treehugger Robot
2022-03-07 21:11:55 +00:00
committed by Automerger Merge Worker
parent 75249f9ed9 b3bdf38453
commit 97fe2742b7
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bp2build/Android.bp
View File

@@ -44,9 +44,16 @@ bootstrap_go_package {
"cc_library_shared_conversion_test.go", "cc_library_shared_conversion_test.go",
"cc_library_static_conversion_test.go", "cc_library_static_conversion_test.go",
"cc_object_conversion_test.go", "cc_object_conversion_test.go",
"cc_prebuilt_library_shared_test.go",
"conversion_test.go", "conversion_test.go",
"filegroup_conversion_test.go", "filegroup_conversion_test.go",
"genrule_conversion_test.go", "genrule_conversion_test.go",
"java_binary_host_conversion_test.go",
"java_import_conversion_test.go",
"java_library_conversion_test.go",
"java_library_host_conversion_test.go",
"java_plugin_conversion_test.go",
"java_proto_conversion_test.go",
"performance_test.go", "performance_test.go",
"prebuilt_etc_conversion_test.go", "prebuilt_etc_conversion_test.go",
"python_binary_conversion_test.go", "python_binary_conversion_test.go",

6
bp2build/java_proto_conversion_test.go
View File

@@ -71,8 +71,7 @@ func TestJavaProto(t *testing.T) {
}` }`
protoLibrary := makeBazelTarget("proto_library", "java-protos_proto", attrNameToString{ protoLibrary := makeBazelTarget("proto_library", "java-protos_proto", attrNameToString{
"srcs": `["a.proto"]`, "srcs": `["a.proto"]`,
"strip_import_prefix": `""`,
}) })
for _, tc := range testCases { for _, tc := range testCases {
@@ -107,8 +106,7 @@ func TestJavaProtoDefault(t *testing.T) {
`, `,
expectedBazelTargets: []string{ expectedBazelTargets: []string{
makeBazelTarget("proto_library", "java-protos_proto", attrNameToString{ makeBazelTarget("proto_library", "java-protos_proto", attrNameToString{
"srcs": `["a.proto"]`, "srcs": `["a.proto"]`,
"strip_import_prefix": `""`,
}), }),
makeBazelTarget( makeBazelTarget(
"java_lite_proto_library", "java_lite_proto_library",