From ad380dddf49d51d86a8a1698efe76c340aada3c0 Mon Sep 17 00:00:00 2001
From: Googler <kotlaja@google.com>
Date: Tue, 28 Mar 2023 05:23:13 -0700
Subject: [PATCH] Automated rollback of commit
 602794efa7fa2d56013e14903578a82860505006.

*** Reason for rollback ***

Introduces regression on implicit dependencies.

*** Original change description ***

Flip Automatic Exec Groups inside java_binary

PiperOrigin-RevId: 519998048
Change-Id: I272cb90eb74466a032762d762c9835cb44b2eb6f
---
 src/main/starlark/builtins_bzl/bazel/java/bazel_java_binary.bzl | 1 -
 src/main/starlark/builtins_bzl/common/java/java_binary.bzl      | 2 --
 src/main/starlark/builtins_bzl/common/java/java_util.bzl        | 1 -
 3 files changed, 4 deletions(-)

diff --git a/src/main/starlark/builtins_bzl/bazel/java/bazel_java_binary.bzl b/src/main/starlark/builtins_bzl/bazel/java/bazel_java_binary.bzl
index 7cb4707aa0fb55..4f910cccfa25a3 100644
--- a/src/main/starlark/builtins_bzl/bazel/java/bazel_java_binary.bzl
+++ b/src/main/starlark/builtins_bzl/bazel/java/bazel_java_binary.bzl
@@ -297,7 +297,6 @@ def make_java_binary(executable, resolve_launcher_flag, has_launcher = False):
                         name = "launcher",
                     ) if resolve_launcher_flag else (_compute_launcher_attr if has_launcher else None),
                 ),
-                "_use_auto_exec_groups": attr.bool(default = True),
             },
             ({} if executable else {
                 "args": attr.string_list(),
diff --git a/src/main/starlark/builtins_bzl/common/java/java_binary.bzl b/src/main/starlark/builtins_bzl/common/java/java_binary.bzl
index 85cb7deefc0e92..c7890e8e8a6cbe 100644
--- a/src/main/starlark/builtins_bzl/common/java/java_binary.bzl
+++ b/src/main/starlark/builtins_bzl/common/java/java_binary.bzl
@@ -377,7 +377,6 @@ def _create_shared_archive(ctx, java_attrs):
         mnemonic = "JavaJSA",
         progress_message = "Dumping Java Shared Archive %s" % jsa.short_path,
         executable = runtime.java_executable_exec_path,
-        toolchain = semantics.JAVA_RUNTIME_TOOLCHAIN_TYPE,
         inputs = depset(input_files, transitive = [runtime.files]),
         outputs = [jsa],
         arguments = [args],
@@ -412,7 +411,6 @@ def _create_one_version_check(ctx, inputs):
         mnemonic = "JavaOneVersion",
         progress_message = "Checking for one-version violations in %{label}",
         executable = tool,
-        toolchain = semantics.JAVA_TOOLCHAIN_TYPE,
         inputs = depset([allowlist], transitive = [inputs]),
         tools = [tool],
         outputs = [output],
diff --git a/src/main/starlark/builtins_bzl/common/java/java_util.bzl b/src/main/starlark/builtins_bzl/common/java/java_util.bzl
index be5cae17f7dba9..3930a2b53fad30 100644
--- a/src/main/starlark/builtins_bzl/common/java/java_util.bzl
+++ b/src/main/starlark/builtins_bzl/common/java/java_util.bzl
@@ -46,7 +46,6 @@ def create_single_jar(ctx, output, *input_depsets):
         mnemonic = "JavaSingleJar",
         progress_message = "Building singlejar jar %s" % output.short_path,
         executable = toolchain.single_jar,
-        toolchain = semantics.JAVA_TOOLCHAIN_TYPE,
         inputs = all_inputs,
         tools = [toolchain.single_jar],
         outputs = [output],