Flip Automatic Exec Groups inside java_library
PiperOrigin-RevId: 516808534
Change-Id: I232fe94137498c4c83deecabee40a4e3146da0db
diff --git a/src/main/starlark/builtins_bzl/common/java/android_lint.bzl b/src/main/starlark/builtins_bzl/common/java/android_lint.bzl
index 24b1c8b..cd2b0fd 100644
--- a/src/main/starlark/builtins_bzl/common/java/android_lint.bzl
+++ b/src/main/starlark/builtins_bzl/common/java/android_lint.bzl
@@ -127,5 +127,6 @@
tools = tools,
arguments = args_list,
execution_requirements = {"supports-workers": "1"},
+ toolchain = semantics.JAVA_TOOLCHAIN_TYPE,
)
return android_lint_out
diff --git a/src/main/starlark/builtins_bzl/common/java/java_library.bzl b/src/main/starlark/builtins_bzl/common/java/java_library.bzl
index 7d64e2f..b38490f 100644
--- a/src/main/starlark/builtins_bzl/common/java/java_library.bzl
+++ b/src/main/starlark/builtins_bzl/common/java/java_library.bzl
@@ -170,7 +170,10 @@
java_library = rule(
_proxy,
- attrs = JAVA_LIBRARY_ATTRS,
+ attrs = merge_attrs(
+ JAVA_LIBRARY_ATTRS,
+ {"_use_auto_exec_groups": attr.bool(default = True)},
+ ),
provides = [JavaInfo],
outputs = {
"classjar": "lib%{name}.jar",
diff --git a/src/main/starlark/builtins_bzl/common/java/proguard_validation.bzl b/src/main/starlark/builtins_bzl/common/java/proguard_validation.bzl
index db8f954..d054990 100644
--- a/src/main/starlark/builtins_bzl/common/java/proguard_validation.bzl
+++ b/src/main/starlark/builtins_bzl/common/java/proguard_validation.bzl
@@ -41,6 +41,7 @@
arguments = [args],
inputs = [spec_file],
outputs = [validated_proguard_spec],
+ toolchain = Label(semantics.JAVA_TOOLCHAIN_TYPE),
)
return validated_proguard_spec
