diff options
| author | Nevena Kotlaja <kotlaja@google.com> | 2023-10-09 12:48:47 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-10-09 12:49:12 -0700 |
| commit | 8d309c980737b6393f4b6431373c240088652f15 (patch) | |
| tree | 47fca16385fd43107b5c28a79d114e182d9ae3bc | |
| parent | 296fe3d842cb253a03ee6c8157090749ef55af49 (diff) | |
| download | bazelbuild-kotlin-rules-8d309c980737b6393f4b6431373c240088652f15.tar.gz | |
Get toolchain type from a kotlin toolchain when setting it on affected actions
Kotlin toolchain can be None (e.g. j2cl_java_library) and this case should be covered.
PiperOrigin-RevId: 572015007
| -rw-r--r-- | kotlin/common.bzl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kotlin/common.bzl b/kotlin/common.bzl index 27097aa..041b728 100644 --- a/kotlin/common.bzl +++ b/kotlin/common.bzl @@ -202,7 +202,7 @@ def _run_kotlinc( } if toolchain.is_profiling_enabled(ctx.label) else { "worker-key-mnemonic": "Kt2JavaCompile", }, - toolchain = kt_jvm_toolchains.type, + toolchain = toolchain.toolchain_type, ) return struct( @@ -315,7 +315,7 @@ def _derive_headers( outputs = [output_dir], mnemonic = "KtDeriveHeaders", progress_message = "Deriving %s: %s" % (output_dir.basename, _get_original_kt_target_label(ctx)), - toolchain = kt_jvm_toolchains.type, + toolchain = toolchain.toolchain_type, ) return [output_dir] @@ -386,7 +386,7 @@ def _offline_instrument_jar(ctx, toolchain, jar, srcs = []): outputs = [output], mnemonic = "KtJaCoCoInstrument", progress_message = "Instrumenting Kotlin for coverage collection: %s" % _get_original_kt_target_label(ctx), - toolchain = kt_jvm_toolchains.type, + toolchain = toolchain.toolchain_type, ) return output @@ -441,7 +441,7 @@ def _merge_jdeps(ctx, kt_jvm_toolchain, jdeps_files, file_factory): arguments = [args], mnemonic = "KtMergeJdeps", progress_message = "Merging jdeps files %{output}", - toolchain = kt_jvm_toolchains.type, + toolchain = kt_jvm_toolchain.toolchain_type, ) return merged_jdeps_file |