diff --git a/java/java.go b/java/java.go
index 0594a8b..990a084 100644
--- a/java/java.go
+++ b/java/java.go
@@ -3403,14 +3403,9 @@
 	return libName
 }
 
-type importAttributes struct {
-	Jars      bazel.LabelListAttribute
-	Exports   bazel.LabelListAttribute
-	Neverlink *bool
-}
-
-type filegroupAttrs struct {
-	Srcs bazel.LabelListAttribute
+type bazelJavaImportAttributes struct {
+	Jars    bazel.LabelListAttribute
+	Exports bazel.LabelListAttribute
 }
 
 // java_import bp2Build converter.
@@ -3426,36 +3421,28 @@
 		}
 	}
 
-	name := android.RemoveOptionalPrebuiltPrefix(i.Name())
-	filegroupTargetName := name + "-jars"
-
-	ctx.CreateBazelTargetModule(
-		bazel.BazelTargetModuleProperties{
-			Rule_class:        "filegroup",
-			Bzl_load_location: "//build/bazel/rules:filegroup.bzl",
-		},
-		android.CommonAttributes{Name: filegroupTargetName},
-		&filegroupAttrs{
-			Srcs: jars,
-		},
-	)
-
-	attrs := &importAttributes{
-		Jars: bazel.MakeSingleLabelListAttribute(bazel.Label{Label: ":" + filegroupTargetName}),
+	attrs := &bazelJavaImportAttributes{
+		Jars: jars,
 	}
 	props := bazel.BazelTargetModuleProperties{
 		Rule_class:        "java_import",
 		Bzl_load_location: "//build/bazel/rules/java:import.bzl",
 	}
 
+	name := android.RemoveOptionalPrebuiltPrefix(i.Name())
+
 	ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: name}, attrs)
 
-	neverlinkAttrs := &importAttributes{
-		Jars:      attrs.Jars,
-		Neverlink: proptools.BoolPtr(true),
+	neverlink := true
+	neverlinkAttrs := &javaLibraryAttributes{
+		Neverlink: bazel.BoolAttribute{Value: &neverlink},
+		Exports:   bazel.MakeSingleLabelListAttribute(bazel.Label{Label: ":" + name}),
+		javaCommonAttributes: &javaCommonAttributes{
+			Sdk_version: bazel.StringAttribute{Value: proptools.StringPtr("none")},
+		},
 	}
 	ctx.CreateBazelTargetModule(
-		props,
+		javaLibraryBazelTargetModuleProperties(),
 		android.CommonAttributes{Name: name + "-neverlink"},
 		neverlinkAttrs)
 }