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" am: 686df31852 am: fd11e9ee5b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2480297

Change-Id: I88b15d97d5c4d84661852d2329c30256bf2b36e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alix Espino
2023-03-13 16:59:27 +00:00
committed by Automerger Merge Worker
parent b713af17e8 fd11e9ee5b
commit ebf4fd11e1
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/java.go
View File

@@ -2844,12 +2844,12 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) {
if !bp2BuildInfo.hasKotlin {
props = bazel.BazelTargetModuleProperties{
Rule_class: "java_library",
Bzl_load_location: "//build/bazel/rules/java:library.bzl",
Bzl_load_location: "//build/bazel/rules/java:rules.bzl",
}
} else {
props = bazel.BazelTargetModuleProperties{
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",
}
}
@@ -2930,6 +2930,7 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) {
props := bazel.BazelTargetModuleProperties{
Rule_class: "java_binary",
Bzl_load_location: "//build/bazel/rules/java:rules.bzl",
}
attrs := &javaBinaryHostAttributes{
Runtime_deps: runtimeDeps,
@@ -2944,7 +2945,7 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) {
ktName := m.Name() + "_kt"
ktProps := bazel.BazelTargetModuleProperties{
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{
@@ -2981,7 +2982,10 @@ func (i *Import) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
attrs := &bazelJavaImportAttributes{
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())
@@ -2992,7 +2996,13 @@ func (i *Import) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
Neverlink: bazel.BoolAttribute{Value: &neverlink},
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)
}