commit e11182283f088d1b10a8f03b45339607f6da6fa7
author Liz Kammer <eakammer@google.com> Wed Oct 18 20:38:37 2023 +0000
committer Liz Kammer <eakammer@google.com> Wed Oct 18 20:38:37 2023 +0000
tree 9d7fcba4e321794cfd21c2950d9dccee3957679e
parent 05f487a4cda0fff607ee2f00509647d94cb1400d

Revert "Don't use java_library for java_import neverlink"

Revert submission 2786699-import-sdk-version-none

Reason for revert: b/306220520

Reverted changes: /q/submissionid:2786699-import-sdk-version-none

Change-Id: I4fbe5fa54dc11fac898a7f15704833f01b9fa269

bp2build/java_import_conversion_test.go

diff --git a/bp2build/java_import_conversion_test.go b/bp2build/java_import_conversion_test.go
index ad69ed5..bba2f50 100644
--- a/bp2build/java_import_conversion_test.go
+++ b/bp2build/java_import_conversion_test.go
@@ -52,15 +52,13 @@
 }
 `,
 		ExpectedBazelTargets: []string{
-			MakeBazelTarget("filegroup", "example_import-jars", AttrNameToString{
-				"srcs": `["import.jar"]`,
-			}),
 			MakeBazelTarget("java_import", "example_import", AttrNameToString{
-				"jars": `[":example_import-jars"]`,
+				"jars": `["import.jar"]`,
 			}),
-			MakeBazelTarget("java_import", "example_import-neverlink", AttrNameToString{
-				"jars":      `[":example_import-jars"]`,
-				"neverlink": `True`,
+			MakeBazelTarget("java_library", "example_import-neverlink", AttrNameToString{
+				"exports":     `[":example_import"]`,
+				"neverlink":   `True`,
+				"sdk_version": `"none"`,
 			}),
 		}})
 }
@@ -88,19 +86,17 @@
 }
 `,
 		ExpectedBazelTargets: []string{
-			MakeBazelTarget("filegroup", "example_import-jars", AttrNameToString{
-				"srcs": `select({
+			MakeBazelTarget("java_import", "example_import", AttrNameToString{
+				"jars": `select({
         "//build/bazel_common_rules/platforms/os:android": ["android.jar"],
         "//build/bazel_common_rules/platforms/os:linux_glibc": ["linux.jar"],
         "//conditions:default": [],
     })`,
 			}),
-			MakeBazelTarget("java_import", "example_import", AttrNameToString{
-				"jars": `[":example_import-jars"]`,
-			}),
-			MakeBazelTarget("java_import", "example_import-neverlink", AttrNameToString{
-				"jars":      `[":example_import-jars"]`,
-				"neverlink": `True`,
+			MakeBazelTarget("java_library", "example_import-neverlink", AttrNameToString{
+				"exports":     `[":example_import"]`,
+				"neverlink":   `True`,
+				"sdk_version": `"none"`,
 			}),
 		}})
 }
@@ -121,15 +117,13 @@
 }
 `,
 		ExpectedBazelTargets: []string{
-			MakeBazelTarget("filegroup", "example_import-jars", AttrNameToString{
-				"srcs": `["import.jar"]`,
-			}),
 			MakeBazelTarget("java_import", "example_import", AttrNameToString{
-				"jars": `[":example_import-jars"]`,
+				"jars": `["import.jar"]`,
 			}),
-			MakeBazelTarget("java_import", "example_import-neverlink", AttrNameToString{
-				"jars":      `[":example_import-jars"]`,
-				"neverlink": `True`,
+			MakeBazelTarget("java_library", "example_import-neverlink", AttrNameToString{
+				"exports":     `[":example_import"]`,
+				"neverlink":   `True`,
+				"sdk_version": `"none"`,
 			}),
 		}})
 }
@@ -148,15 +142,13 @@
 }
 `,
 		ExpectedBazelTargets: []string{
-			MakeBazelTarget("filegroup", "test_lib-jars", AttrNameToString{
-				"srcs": `["test.jar"]`,
-			}),
 			MakeBazelTarget("java_import", "test_lib", AttrNameToString{
-				"jars": `[":test_lib-jars"]`,
+				"jars": `["test.jar"]`,
 			}),
-			MakeBazelTarget("java_import", "test_lib-neverlink", AttrNameToString{
-				"jars":      `[":test_lib-jars"]`,
-				"neverlink": `True`,
+			MakeBazelTarget("java_library", "test_lib-neverlink", AttrNameToString{
+				"exports":     `[":test_lib"]`,
+				"neverlink":   `True`,
+				"sdk_version": `"none"`,
 			}),
 		},
 	}, func(ctx android.RegistrationContext) {