Remove `java_attrs.resources` This was only ever added to the inputs of the deploy jar action but not passed on the command line so effectively unused. (ignore-relnotes) PiperOrigin-RevId: 968340782 Change-Id: I3878d622095cf72d245dcff0cf1de25dcb53d081
diff --git a/java/common/rules/impl/BUILD b/java/common/rules/impl/BUILD index 70adecc..a6eb44b 100644 --- a/java/common/rules/impl/BUILD +++ b/java/common/rules/impl/BUILD
@@ -21,7 +21,6 @@ deps = [ ":java_helper_bzl", "//java/common:proguard_spec_info_bzl", - "@com_google_protobuf//bazel/common:proto_info_bzl", "@rules_cc//cc/common:cc_helper_bzl", ], )
diff --git a/java/common/rules/impl/java_binary_deploy_jar.bzl b/java/common/rules/impl/java_binary_deploy_jar.bzl index d6add14..2600e4e 100644 --- a/java/common/rules/impl/java_binary_deploy_jar.bzl +++ b/java/common/rules/impl/java_binary_deploy_jar.bzl
@@ -69,7 +69,6 @@ launcher_info.launcher, main_class, coverage_main_class, - java_attrs.resources, classpath_resources, runtime_classpath, manifest_lines, @@ -91,7 +90,6 @@ launcher_info.unstripped_launcher, main_class, coverage_main_class, - java_attrs.resources, classpath_resources, runtime_classpath, manifest_lines, @@ -112,7 +110,6 @@ launcher, main_class, coverage_main_class, - resources, classpath_resources, runtime_classpath, manifest_lines, @@ -135,7 +132,6 @@ launcher: (File) the launcher artifact main_class: (String) FQN of the entry point for execution coverage_main_class: (String) FQN of the entry point for coverage collection - resources: (Depset) resource inputs classpath_resources: (Depset) classpath resource inputs runtime_classpath: (Depset) source files to add to the jar build_target: (String) Name of the build target for stamping @@ -155,7 +151,6 @@ input_files.extend(build_info_files) transitive_input_files = [ - resources, classpath_resources, runtime_classpath, ]
diff --git a/java/common/rules/impl/java_binary_impl.bzl b/java/common/rules/impl/java_binary_impl.bzl index 8b9b68d..13718eb 100644 --- a/java/common/rules/impl/java_binary_impl.bzl +++ b/java/common/rules/impl/java_binary_impl.bzl
@@ -14,7 +14,6 @@ """ Implementation of java_binary for bazel """ -load("@com_google_protobuf//bazel/common:proto_info.bzl", "ProtoInfo") load("@rules_cc//cc/common:cc_common.bzl", "cc_common") load("@rules_cc//cc/common:cc_helper.bzl", "cc_helper") load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") @@ -300,13 +299,6 @@ runtime_classpath_for_archive = get_runtime_classpath_for_archive(runtime_classpath, deploy_env_jars) runtime_jars = [ctx.outputs.classjar] - resources = [p for p in ctx.files.srcs if p.extension == "properties"] - transitive_resources = [] - for r in ctx.attr.resources: - transitive_resources.append( - r[ProtoInfo].transitive_sources if ProtoInfo in r else r.files, - ) - resource_names = dict() for r in classpath_resources: if r.basename in resource_names: @@ -318,7 +310,6 @@ runtime_classpath_for_archive = runtime_classpath_for_archive, classpath_resources = depset(classpath_resources), runtime_classpath = depset(order = "preorder", direct = runtime_jars, transitive = [runtime_classpath]), - resources = depset(resources, transitive = transitive_resources), ) def _generate_coverage_manifest(ctx, output, runtime_classpath): @@ -455,7 +446,6 @@ launcher = launcher_info.launcher, main_class = main_class, coverage_main_class = coverage_main_class, - resources = java_attrs.resources, classpath_resources = java_attrs.classpath_resources, runtime_classpath = runtime_classpath, manifest_lines = [],