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

Merge "Pass java_library libs and static_libs to java_*_proto_library" into main

Browse Source
This commit is contained in:
Zi Wang
2023-09-23 03:45:48 +00:00
committed by Gerrit Code Review
parent 11b20b2993 4dbd0e8688
commit 7c5b6d5273
4 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bp2build/java_proto_conversion_test.go
View File

@@ -141,17 +141,22 @@ func TestJavaProtoDefault(t *testing.T) {
func TestJavaLibsAndOnlyProtoSrcs(t *testing.T) {
runJavaProtoTestCase(t, Bp2buildTestCase{
Description: "java_library that has only proto srcs",
StubbedBuildDefinitions: []string{"java-lib"},
StubbedBuildDefinitions: []string{"java-lib-1", "java-lib-2"},
Blueprint: `java_library_static {
name: "java-protos",
srcs: ["a.proto"],
libs: ["java-lib"],
libs: ["java-lib-1"],
static_libs: ["java-lib-2"],
java_version: "7",
sdk_version: "current",
}
java_library_static {
name: "java-lib",
name: "java-lib-1",
}
java_library_static {
name: "java-lib-2",
}
`,
ExpectedBazelTargets: []string{
@@ -162,12 +167,19 @@ java_library_static {
"java_lite_proto_library",
"java-protos_java_proto_lite",
AttrNameToString{
"deps": `[":java-protos_proto"]`,
"deps": `[":java-protos_proto"]`,
"additional_proto_deps": `[
":java-lib-1-neverlink",
":java-lib-2",
]`,
"java_version": `"7"`,
"sdk_version": `"current"`,
}),
MakeBazelTarget("java_library", "java-protos", AttrNameToString{
"exports": `[":java-protos_java_proto_lite"]`,
"exports": `[
":java-lib-2",
":java-protos_java_proto_lite",
]`,
"java_version": `"7"`,
"sdk_version": `"current"`,
}),