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

resource_strip_prefix support for kotlin srcs

Browse Source 
change load locations for kt_jvm_library to be the macro

Change-Id: Id50fcb1f880013fe57647a065cd6b7149d7c5d91
Test: built kotlinx_coroutines locally and compared jar file to soong
Bug: 268519061
This commit is contained in:
Alix
2023-02-23 16:38:12 +00:00
parent f229654372
commit 4d56abf937
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java.go
View File

@@ -2838,7 +2838,7 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) {
props = bazel.BazelTargetModuleProperties{ props = bazel.BazelTargetModuleProperties{
Rule_class: "kt_jvm_library", Rule_class: "kt_jvm_library",
Bzl_load_location: "@rules_kotlin//kotlin:jvm_library.bzl", Bzl_load_location: "//build/bazel/rules/kotlin:kt_jvm_library.bzl",
} }
} }
@@ -2933,7 +2933,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: "@rules_kotlin//kotlin:jvm_library.bzl", Bzl_load_location: "//build/bazel/rules/kotlin:kt_jvm_library.bzl",
} }
ktAttrs := &javaLibraryAttributes{ ktAttrs := &javaLibraryAttributes{
Deps: deps, Deps: deps,