From 266bbf2f9c82c9acda9e47ec4047b3ed94f8a80d Mon Sep 17 00:00:00 2001 From: Alix Date: Thu, 15 Dec 2022 06:12:46 +0000 Subject: Libs support for * -> java_library_edge with kt sources Bug: 244210934 Test: bo2build tests and built kotlinx_atomicfu Change-Id: Id6eac2f104878e4d7902a32e846ef1cc87dd7863 --- bp2build/java_library_conversion_test.go | 2 ++ java/java.go | 18 ++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bp2build/java_library_conversion_test.go b/bp2build/java_library_conversion_test.go index e37fa627a..84c664e24 100644 --- a/bp2build/java_library_conversion_test.go +++ b/bp2build/java_library_conversion_test.go @@ -685,6 +685,7 @@ func TestJavaLibraryKotlinSrcs(t *testing.T) { "c.kt", ]`, }), + MakeNeverlinkDuplicateTarget("kt_jvm_library", "java-lib-1"), }, }) } @@ -707,6 +708,7 @@ func TestJavaLibraryKotlinCommonSrcs(t *testing.T) { ]`, "common_srcs": `["c.kt"]`, }), + MakeNeverlinkDuplicateTarget("kt_jvm_library", "java-lib-1"), }, }) } diff --git a/java/java.go b/java/java.go index 9dd585062..54b15f80e 100644 --- a/java/java.go +++ b/java/java.go @@ -2710,14 +2710,6 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) { Rule_class: "java_library", Bzl_load_location: "//build/bazel/rules/java:library.bzl", } - - ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: name}, attrs) - neverlinkProp := true - neverLinkAttrs := &javaLibraryAttributes{ - Exports: bazel.MakeSingleLabelListAttribute(bazel.Label{Label: ":" + name}), - Neverlink: bazel.BoolAttribute{Value: &neverlinkProp}, - } - ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: name + "-neverlink"}, neverLinkAttrs) } else { attrs.Common_srcs = bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, m.properties.Common_srcs)) @@ -2725,10 +2717,16 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) { Rule_class: "kt_jvm_library", Bzl_load_location: "@rules_kotlin//kotlin:jvm_library.bzl", } - // TODO (b/244210934): create neverlink-duplicate target once kt_jvm_library supports neverlink attribute - ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: name}, attrs) } + ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: name}, attrs) + neverlinkProp := true + neverLinkAttrs := &javaLibraryAttributes{ + Exports: bazel.MakeSingleLabelListAttribute(bazel.Label{Label: ":" + name}), + Neverlink: bazel.BoolAttribute{Value: &neverlinkProp}, + } + ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: name + "-neverlink"}, neverLinkAttrs) + } type javaBinaryHostAttributes struct { -- cgit v1.2.3