Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable worker-key-mnemonic for KotlinCompile + KotlinKapt. #518

Merged
merged 1 commit into from
Apr 2, 2021
Merged

Enable worker-key-mnemonic for KotlinCompile + KotlinKapt. #518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions kotlin/internal/jvm/compile.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,6 @@ def _run_kt_builder_action(
javac_options = ctx.attr.javac_opts[_JavacOptions] if ctx.attr.javac_opts else toolchains.kt.javac_options
args.add_all("--kotlin_passthrough_flags", _kotlinc_options_provider_to_flags(kotlinc_options, toolchains.kt.language_version))
args.add_all("--javacopts", _javac_options_provider_to_flags(javac_options))

# TODO: Implement Strict Kotlin deps: (https://github.com/bazelbuild/rules_kotlin/issues/419)
# This flag is currently unused by the builder but required for the unused_deps tool
args.add_all("--direct_dependencies", _java_infos_to_compile_jars(compile_deps.deps))
args.add("--strict_kotlin_deps", toolchains.kt.experimental_strict_kotlin_deps)
args.add_all("--classpath", compile_deps.compile_jars)
Expand Down Expand Up @@ -482,7 +479,10 @@ def _run_kt_builder_action(
input_manifests = input_manifests,
outputs = [f for f in outputs.values()],
executable = toolchains.kt.kotlinbuilder.files_to_run.executable,
execution_requirements = toolchains.kt.execution_requirements,
execution_requirements = _utils.add_dicts(
toolchains.kt.execution_requirements,
{ "worker-key-mnemonic": "KotlinCompile" }
),
arguments = [args],
progress_message = progress_message,
env = {
Expand Down