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

Merge "Update load statements in java.go bp2build"

Browse Source
This commit is contained in:
Alix Espino
2023-03-13 15:27:15 +00:00
committed by Gerrit Code Review
parent cb301ccdca 82acaf545f
commit 686df31852
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
java/java.go
View File

@@ -2844,12 +2844,12 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) {
if !bp2BuildInfo.hasKotlin { if !bp2BuildInfo.hasKotlin {
props = bazel.BazelTargetModuleProperties{ props = bazel.BazelTargetModuleProperties{
Rule_class: "java_library", Rule_class: "java_library",
Bzl_load_location: "//build/bazel/rules/java:library.bzl", Bzl_load_location: "//build/bazel/rules/java:rules.bzl",
} }
} else { } else {
props = bazel.BazelTargetModuleProperties{ props = bazel.BazelTargetModuleProperties{
Rule_class: "kt_jvm_library", Rule_class: "kt_jvm_library",
Bzl_load_location: "//build/bazel/rules/kotlin:kt_jvm_library.bzl", Bzl_load_location: "//build/bazel/rules/kotlin:rules.bzl",
} }
} }
@@ -2929,7 +2929,8 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) {
} }
props := bazel.BazelTargetModuleProperties{ props := bazel.BazelTargetModuleProperties{
Rule_class: "java_binary", Rule_class: "java_binary",
Bzl_load_location: "//build/bazel/rules/java:rules.bzl",
} }
attrs := &javaBinaryHostAttributes{ attrs := &javaBinaryHostAttributes{
Runtime_deps: runtimeDeps, Runtime_deps: runtimeDeps,
@@ -2944,7 +2945,7 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) {
ktName := m.Name() + "_kt" ktName := m.Name() + "_kt"
ktProps := bazel.BazelTargetModuleProperties{ ktProps := bazel.BazelTargetModuleProperties{
Rule_class: "kt_jvm_library", Rule_class: "kt_jvm_library",
Bzl_load_location: "//build/bazel/rules/kotlin:kt_jvm_library.bzl", Bzl_load_location: "//build/bazel/rules/kotlin:rules.bzl",
} }
ktAttrs := &javaLibraryAttributes{ ktAttrs := &javaLibraryAttributes{
@@ -2981,7 +2982,10 @@ func (i *Import) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
attrs := &bazelJavaImportAttributes{ attrs := &bazelJavaImportAttributes{
Jars: jars, Jars: jars,
} }
props := bazel.BazelTargetModuleProperties{Rule_class: "java_import"} props := bazel.BazelTargetModuleProperties{
Rule_class: "java_import",
Bzl_load_location: "//build/bazel/rules/java:rules.bzl",
}
name := android.RemoveOptionalPrebuiltPrefix(i.Name()) name := android.RemoveOptionalPrebuiltPrefix(i.Name())
@@ -2992,7 +2996,13 @@ func (i *Import) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
Neverlink: bazel.BoolAttribute{Value: &neverlink}, Neverlink: bazel.BoolAttribute{Value: &neverlink},
Exports: bazel.MakeSingleLabelListAttribute(bazel.Label{Label: ":" + name}), Exports: bazel.MakeSingleLabelListAttribute(bazel.Label{Label: ":" + name}),
} }
ctx.CreateBazelTargetModule(bazel.BazelTargetModuleProperties{Rule_class: "java_library"}, android.CommonAttributes{Name: name + "-neverlink"}, neverlinkAttrs) ctx.CreateBazelTargetModule(
bazel.BazelTargetModuleProperties{
Rule_class: "java_library",
Bzl_load_location: "//build/bazel/rules/java:rules.bzl",
},
android.CommonAttributes{Name: name + "-neverlink"},
neverlinkAttrs)
} }