From d8ccd7ee7d600f316393640f1e5820fdbbcb1888 Mon Sep 17 00:00:00 2001 From: Scotte Zinn Date: Mon, 15 Jun 2020 16:35:38 -0400 Subject: [PATCH] Specify what the compile_jar value should be when building the library --- kotlin/internal/jvm/compile.bzl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kotlin/internal/jvm/compile.bzl b/kotlin/internal/jvm/compile.bzl index 9b90c08a3..261a1db61 100644 --- a/kotlin/internal/jvm/compile.bzl +++ b/kotlin/internal/jvm/compile.bzl @@ -223,7 +223,7 @@ def _java_info_to_compile_jars(target): # MAIN ACTIONS ######################################################################################################### -def kt_jvm_compile_action(ctx, rule_kind, output_jar): +def kt_jvm_compile_action(ctx, rule_kind, output_jar, compile_jar): """This macro sets up a compile action for a Kotlin jar. Args: @@ -242,8 +242,6 @@ def kt_jvm_compile_action(ctx, rule_kind, output_jar): transitive_runtime_jars = _plugin_mappers.targets_to_transitive_runtime_jars(ctx.attr.plugins + ctx.attr.deps) plugins = ctx.attr.plugins - compile_jar = output_jar - if toolchains.kt.experimental_use_abi_jars: kt_compile_jar = ctx.actions.declare_file(ctx.label.name + "-kt.abi.jar") _run_kt_builder_action( @@ -444,4 +442,5 @@ def kt_jvm_produce_jar_actions(ctx, rule_kind): ctx, rule_kind = rule_kind, output_jar = kt_compile_output_jar, + compile_jar = output_jar, )