Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions java/common/rules/java_package_configuration.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ JavaPackageConfigurationInfo = provider(
"matches",
"package_specs",
"system",
"unused_deps",
],
)

Expand All @@ -50,6 +51,7 @@ def _rule_impl(ctx):
matches = _matches,
package_specs = package_specs,
system = system,
unused_deps = ctx.attr.unused_deps,
),
]

Expand Down Expand Up @@ -116,6 +118,13 @@ The list of files needed by this configuration at runtime.
providers = [BootClassPathInfo],
doc = """
Corresponds to javac's --system flag.
""",
),
"unused_deps": attr.string(
default = "off",
values = ["off", "error"],
doc = """
Unused dependencies checking mode.
""",
),
# buildifier: disable=attr-licenses
Expand Down
33 changes: 32 additions & 1 deletion java/private/java_common_internal.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ load("//java/common/rules:java_helper.bzl", "helper")
load("//java/common/rules:java_toolchain.bzl", "JavaToolchainInfo")
load(
":java_info.bzl",
"JavaInfo",
"JavaPluginInfo",
"disable_plugin_info_annotation_processing",
"java_info_for_compilation",
Expand Down Expand Up @@ -314,7 +315,36 @@ def compile(
if uses_annotation_processing:
generated_class_jar = _derive_output_file(ctx, output, name_suffix = "-gen")
generated_source_jar = _derive_output_file(ctx, output, name_suffix = "-gensrc")
get_internal_java_common().create_compilation_action(

direct_dep_jars_to_verify = []
resolved_unused_deps_mode = "off"
internal_common = get_internal_java_common()
is_unused_deps_supported = hasattr(internal_common, "is_unused_deps_supported") and internal_common.is_unused_deps_supported()

if is_unused_deps_supported and not ctx.label.workspace_name:
for package_config in java_toolchain._package_configuration:
matched = package_config.matches(package_config.package_specs, ctx.label)
if matched:
if hasattr(package_config, "unused_deps"):
resolved_unused_deps_mode = package_config.unused_deps

if resolved_unused_deps_mode == "error" and hasattr(ctx.attr, "deps"):
for dep in ctx.attr.deps:
if JavaInfo in dep:
if hasattr(dep[JavaInfo], "java_outputs"):
for output_info in dep[JavaInfo].java_outputs:
compile_jar = output_info.compile_jar if output_info.compile_jar else output_info.class_jar
if compile_jar:
direct_dep_jars_to_verify.append(struct(
jar = compile_jar,
label = str(dep.label),
))

additional_kwargs = {}
if is_unused_deps_supported:
additional_kwargs["direct_dep_jars_to_verify"] = direct_dep_jars_to_verify

internal_common.create_compilation_action(
ctx,
java_toolchain,
output,
Expand Down Expand Up @@ -343,6 +373,7 @@ def compile(
enable_direct_classpath,
annotation_processor_additional_inputs,
annotation_processor_additional_outputs,
**additional_kwargs
)

create_output_source_jar = len(source_files) > 0 or source_jars != [output_source_jar]
Expand Down