StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Libs support for * -> java_library_edge with kt sources

Browse Source 
Bug: 244210934
Test: bo2build tests and built kotlinx_atomicfu
Change-Id: Id6eac2f104878e4d7902a32e846ef1cc87dd7863
This commit is contained in:
Alix
2022-12-15 06:12:46 +00:00
parent ccfe6022d4
commit 266bbf2f9c
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bp2build/java_library_conversion_test.go
View File

@@ -685,6 +685,7 @@ func TestJavaLibraryKotlinSrcs(t *testing.T) {
"c.kt", "c.kt",
]`, ]`,
}), }),
MakeNeverlinkDuplicateTarget("kt_jvm_library", "java-lib-1"),
}, },
}) })
} }
@@ -707,6 +708,7 @@ func TestJavaLibraryKotlinCommonSrcs(t *testing.T) {
]`, ]`,
"common_srcs": `["c.kt"]`, "common_srcs": `["c.kt"]`,
}), }),
MakeNeverlinkDuplicateTarget("kt_jvm_library", "java-lib-1"),
}, },
}) })
} }

18
java/java.go
View File

@@ -2710,14 +2710,6 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) {
Rule_class: "java_library", Rule_class: "java_library",
Bzl_load_location: "//build/bazel/rules/java:library.bzl", 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 { } else {
attrs.Common_srcs = bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, m.properties.Common_srcs)) 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", Rule_class: "kt_jvm_library",
Bzl_load_location: "@rules_kotlin//kotlin:jvm_library.bzl", 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 { type javaBinaryHostAttributes struct {