From e8700e30def11d33eba28a928930515c7f963e63 Mon Sep 17 00:00:00 2001 From: Googler Date: Fri, 20 Oct 2023 01:28:55 -0700 Subject: [PATCH] Add toolchain param to run_singlejar rule This fixes issue with Bazel downstream when building `@bazel_tools//tools/android:gen_java_base_extras_jar` with `--incompatible_auto_exec_groups` flag which enables AEGs in Bazel. Since the rule needs to register java toolchain, I've also used that toolchain for the action's executable (`_java_toolchain` is not needed anymore and can be deleted). PiperOrigin-RevId: 575139627 Change-Id: I60f0aae58aac8156cbf367c96297d7ad7227f655 --- tools/android/defs.bzl | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/android/defs.bzl b/tools/android/defs.bzl index 4612846ee0c87d..22baafc62f3ec2 100644 --- a/tools/android/defs.bzl +++ b/tools/android/defs.bzl @@ -46,8 +46,9 @@ def _run_singlejar(ctx): ctx.actions.run( inputs = ctx.files.srcs, outputs = [ctx.outputs.out], - executable = ctx.attr._java_toolchain[java_common.JavaToolchainInfo].single_jar, + executable = ctx.toolchains["@bazel_tools//tools/jdk:toolchain_type"].java.single_jar, arguments = [args], + toolchain = "@bazel_tools//tools/jdk:toolchain_type", ) return [DefaultInfo(files = depset([ctx.outputs.out]))] @@ -59,9 +60,6 @@ run_singlejar = rule( "srcs": attr.label_list(mandatory = True), "out": attr.output(mandatory = True), "include_prefixes": attr.string_list(), - "_java_toolchain": attr.label( - default = "//tools/jdk:current_java_toolchain", - providers = [java_common.JavaToolchainInfo], - ), }, + toolchains = ["@bazel_tools//tools/jdk:toolchain_type"], )