diff options
Diffstat (limited to 'toolchains')
| -rw-r--r-- | toolchains/kotlin_jvm/BUILD | 1 | ||||
| -rw-r--r-- | toolchains/kotlin_jvm/androidlint_toolchains.bzl | 4 | ||||
| -rw-r--r-- | toolchains/kotlin_jvm/java_toolchains.bzl | 2 | ||||
| -rw-r--r-- | toolchains/kotlin_jvm/kt_jvm_toolchains.bzl | 21 |
4 files changed, 5 insertions, 23 deletions
diff --git a/toolchains/kotlin_jvm/BUILD b/toolchains/kotlin_jvm/BUILD index 66056a7..de24049 100644 --- a/toolchains/kotlin_jvm/BUILD +++ b/toolchains/kotlin_jvm/BUILD @@ -55,7 +55,6 @@ toolchain( kt_jvm_toolchains.declare( name = "kt_jvm_toolchain_no_turbine_darwin_jdk", - enable_turbine_direct = False, ) # Turn on profiling of Kotlin/JVM actions diff --git a/toolchains/kotlin_jvm/androidlint_toolchains.bzl b/toolchains/kotlin_jvm/androidlint_toolchains.bzl index b4c2208..eb61fcb 100644 --- a/toolchains/kotlin_jvm/androidlint_toolchains.bzl +++ b/toolchains/kotlin_jvm/androidlint_toolchains.bzl @@ -14,8 +14,10 @@ """Android Lint toolchain for Kotlin.""" -load("//bazel:stubs.bzl", "lint_actions") load("//:visibility.bzl", "RULES_KOTLIN") +load("//bazel:stubs.bzl", "lint_actions") + +visibility(RULES_KOTLIN) _ATTRS = dict( _android_lint_baseline_file = attr.label( diff --git a/toolchains/kotlin_jvm/java_toolchains.bzl b/toolchains/kotlin_jvm/java_toolchains.bzl index 74095de..0b7a6a5 100644 --- a/toolchains/kotlin_jvm/java_toolchains.bzl +++ b/toolchains/kotlin_jvm/java_toolchains.bzl @@ -16,6 +16,8 @@ load("//:visibility.bzl", "RULES_DEFS_THAT_COMPILE_KOTLIN") +visibility(RULES_DEFS_THAT_COMPILE_KOTLIN) + _ATTRS = dict( _java_toolchain = attr.label( default = Label( diff --git a/toolchains/kotlin_jvm/kt_jvm_toolchains.bzl b/toolchains/kotlin_jvm/kt_jvm_toolchains.bzl index 16f8ac2..42784ac 100644 --- a/toolchains/kotlin_jvm/kt_jvm_toolchains.bzl +++ b/toolchains/kotlin_jvm/kt_jvm_toolchains.bzl @@ -62,9 +62,6 @@ def _kt_jvm_toolchain_impl(ctx): proguard_whitelister = ctx.attr.proguard_whitelister[DefaultInfo].files_to_run, source_jar_zipper = ctx.file.source_jar_zipper, toolchain_type = None if ctx.attr.toolchain_type == None else str(ctx.attr.toolchain_type.label), - turbine = ctx.file.turbine, - turbine_direct = _opt_for_test(ctx.attr.turbine_direct, lambda x: x[DefaultInfo].files_to_run), - turbine_java_runtime = ctx.attr.turbine_java_runtime, # go/keep-sorted end ) return [ @@ -100,11 +97,6 @@ kt_jvm_toolchain = rule( coverage_runtime = attr.label( default = "@maven//:org_jacoco_org_jacoco_agent", ), - enable_turbine_direct = attr.bool( - # If disabled, the value of turbine_direct will be ignored. - # Starlark doesn't allow None to override default-valued attributes: - default = True, - ), genclass = attr.label( default = "@bazel_tools//tools/jdk:GenClass_deploy.jar", cfg = "exec", @@ -188,19 +180,6 @@ kt_jvm_toolchain = rule( cfg = "exec", allow_single_file = [".jar"], ), - turbine = attr.label( - default = "@bazel_tools//tools/jdk:turbine_direct", - cfg = "exec", - allow_single_file = True, - ), - turbine_direct = attr.label( - executable = True, - cfg = "exec", - allow_single_file = True, - ), - turbine_java_runtime = attr.label( - cfg = "exec", - ), toolchain_type = attr.label(), ), provides = [platform_common.ToolchainInfo], |