diff options
author | Liz Kammer <eakammer@google.com> | 2023-10-12 19:47:38 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-10-12 19:47:38 +0000 |
commit | c723757dd7dabb5b97fabbd1457738f8417e4970 (patch) | |
tree | 2255fde0781efe1ae95b9220f178825e7d4de07b /bp2build | |
parent | ad35c572887baa2c606f4b4eda44bfefd79710f3 (diff) | |
parent | 9f52f6ba604b51a8e51e3681c51c161432a00083 (diff) | |
download | soong-c723757dd7dabb5b97fabbd1457738f8417e4970.tar.gz |
Merge "Change openjdk9 specific props in bp2build/Soong" into main
Diffstat (limited to 'bp2build')
-rw-r--r-- | bp2build/java_library_conversion_test.go | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/bp2build/java_library_conversion_test.go b/bp2build/java_library_conversion_test.go index 9cb9443cc..2e205b16c 100644 --- a/bp2build/java_library_conversion_test.go +++ b/bp2build/java_library_conversion_test.go @@ -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"}, |