From 4d56abf9375f6b6b0f945bfd725036c19e8d08a7 Mon Sep 17 00:00:00 2001 From: Alix Date: Thu, 23 Feb 2023 16:38:12 +0000 Subject: [PATCH] resource_strip_prefix support for kotlin srcs 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 --- java/java.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java.go b/java/java.go index a00e26f83..574709169 100644 --- a/java/java.go +++ b/java/java.go @@ -2838,7 +2838,7 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) { props = bazel.BazelTargetModuleProperties{ 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" ktProps := bazel.BazelTargetModuleProperties{ 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{ Deps: deps,