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

Merge "Delete java/rules.bzl file" am: 9241da9662 am: 3e10aabe32

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

Change-Id: I7ce381043f106fe8169a86878b003711acf9aa57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alix Espino
2023-05-09 21:33:04 +00:00
committed by Automerger Merge Worker
parent 827fb987fc 3e10aabe32
commit 00f6ca1e7c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java.go
View File

@@ -2980,7 +2980,7 @@ func ktJvmLibraryBazelTargetModuleProperties() bazel.BazelTargetModuleProperties
func javaLibraryBazelTargetModuleProperties() bazel.BazelTargetModuleProperties {
return bazel.BazelTargetModuleProperties{
Rule_class: "java_library",
Bzl_load_location: "//build/bazel/rules/java:rules.bzl",
Bzl_load_location: "//build/bazel/rules/java:library.bzl",
}
}
@@ -3089,7 +3089,7 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) {
props := bazel.BazelTargetModuleProperties{
Rule_class: "java_binary",
Bzl_load_location: "//build/bazel/rules/java:rules.bzl",
Bzl_load_location: "@rules_java//java:defs.bzl",
}
binAttrs := &javaBinaryHostAttributes{
Runtime_deps: runtimeDeps,
@@ -3145,7 +3145,7 @@ func (i *Import) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
}
props := bazel.BazelTargetModuleProperties{
Rule_class: "java_import",
Bzl_load_location: "//build/bazel/rules/java:rules.bzl",
Bzl_load_location: "//build/bazel/rules/java:import.bzl",
}
name := android.RemoveOptionalPrebuiltPrefix(i.Name())