Skip to content

Commit

Permalink
Automated rollback of commit 602794e.
Browse files Browse the repository at this point in the history
*** Reason for rollback ***

Introduces regression on implicit dependencies.

*** Original change description ***

Flip Automatic Exec Groups inside java_binary

PiperOrigin-RevId: 519998048
Change-Id: I272cb90eb74466a032762d762c9835cb44b2eb6f
  • Loading branch information
kotlaja authored and copybara-github committed Mar 28, 2023
1 parent e69aad7 commit ad380dd
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 0 additions & 2 deletions src/main/starlark/builtins_bzl/common/java/java_binary.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down Expand Up @@ -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],
Expand Down
1 change: 0 additions & 1 deletion src/main/starlark/builtins_bzl/common/java/java_util.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down

0 comments on commit ad380dd

Please sign in to comment.