Change openjdk9 specific props in bp2build/Soong

JDK17 is the default java version, adding these props conditionally
openjdk9 is no longer relevant

Test: CI
Change-Id: I5d80fd22f474cedf389d1e295620cfc17bc327a0
This commit is contained in:
Liz Kammer
2023-10-06 16:47:00 -04:00
parent 91738fddb3
commit 9f52f6ba60
3 changed files with 57 additions and 4 deletions

View File

@@ -192,6 +192,45 @@ func TestJavaLibraryJavaVersion(t *testing.T) {
})
}
func TestJavaLibraryOpenjdk9(t *testing.T) {
runJavaLibraryTestCase(t, Bp2buildTestCase{
Blueprint: `java_library {
name: "java-lib-1",
srcs: ["a.java"],
exclude_srcs: ["b.java"],
javacflags: ["flag"],
target: {
android: {
srcs: ["android.java"],
},
},
openjdk9: {
srcs: ["b.java", "foo.java"],
javacflags: ["extraflag"],
},
sdk_version: "current",
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{
"srcs": `[
"a.java",
"foo.java",
] + select({
"//build/bazel_common_rules/platforms/os:android": ["android.java"],
"//conditions:default": [],
})`,
"sdk_version": `"current"`,
"javacopts": `[
"flag",
"extraflag",
]`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
},
})
}
func TestJavaLibraryErrorproneEnabledManually(t *testing.T) {
runJavaLibraryTestCaseWithRegistrationCtxFunc(t, Bp2buildTestCase{
StubbedBuildDefinitions: []string{"plugin2"},