diff options
| author | Alix Espino <agespino@google.com> | 2023-01-04 22:11:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-01-04 22:11:55 +0000 |
| commit | d363771bc10a476e5b4850b213624bd865ffc18b (patch) | |
| tree | f6984e6024a50dd345a9c22d2c03bf85ac041a24 | |
| parent | 49dd3d583e1b99b54921b472bbd38f04d95ead3f (diff) | |
| parent | 266bbf2f9c82c9acda9e47ec4047b3ed94f8a80d (diff) | |
| download | soong-d363771bc10a476e5b4850b213624bd865ffc18b.tar.gz | |
Merge "Libs support for * -> java_library_edge with kt sources"
| -rw-r--r-- | bp2build/java_library_conversion_test.go | 2 | ||||
| -rw-r--r-- | 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 e83678ed1..946a1df4f 100644 --- a/java/java.go +++ b/java/java.go @@ -2764,14 +2764,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)) @@ -2779,10 +2771,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 { |