Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d56abf9 authored by Alix's avatar Alix
Browse files

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
parent f2296543

java/java.go

+2 −2
Original line number Diff line number Diff line
@@ -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,