Remove `java_binary.classlist` PiperOrigin-RevId: 702233460 Change-Id: I008dbf4d484b03d484ebc6882634191e7a72461c
diff --git a/java/common/rules/impl/java_binary_deploy_jar.bzl b/java/common/rules/impl/java_binary_deploy_jar.bzl index 6df08cb..8755d95 100644 --- a/java/common/rules/impl/java_binary_deploy_jar.bzl +++ b/java/common/rules/impl/java_binary_deploy_jar.bzl
@@ -38,7 +38,6 @@ hermetic = False, add_exports = depset(), add_opens = depset(), - shared_archive = None, one_version_level = "OFF", one_version_allowlist = None, extra_args = [], @@ -55,7 +54,6 @@ hermetic: (bool) add_exports: (depset) add_opens: (depset) - shared_archive: (File) Optional .jsa artifact one_version_level: (String) Optional one version check level, default OFF one_version_allowlist: (File) Optional allowlist for one version check extra_args: (list[Args]) Optional arguments for the deploy jar action @@ -87,7 +85,6 @@ build_info_files, build_target, output = ctx.outputs.deployjar, - shared_archive = shared_archive, one_version_level = one_version_level, one_version_allowlist = one_version_allowlist, multi_release = multi_release, @@ -131,7 +128,6 @@ build_info_files, build_target, output, - shared_archive = None, one_version_level = "OFF", one_version_allowlist = None, multi_release = False, @@ -156,7 +152,6 @@ build_info_files: (list[File]) build info files for stamping build_target: (String) the owner build target label name string output: (File) the output jar artifact - shared_archive: (File) Optional .jsa artifact one_version_level: (String) Optional one version check level, default OFF one_version_allowlist: (File) Optional allowlist for one version check multi_release: (bool) @@ -217,18 +212,15 @@ java_home = runtime.java_home lib_modules = runtime.lib_modules hermetic_files = runtime.hermetic_files + default_cds = runtime.default_cds args.add("--hermetic_java_home", java_home) args.add("--jdk_lib_modules", lib_modules) args.add_all("--resources", hermetic_files) input_files.append(lib_modules) transitive_input_files.append(hermetic_files) - - if shared_archive == None: - shared_archive = runtime.default_cds - - if shared_archive: - input_files.append(shared_archive) - args.add("--cds_archive", shared_archive) + if default_cds: + input_files.append(default_cds) + args.add("--cds_archive", default_cds) args.add_all("--add_exports", add_exports) args.add_all("--add_opens", add_opens)
diff --git a/java/common/rules/java_runtime.bzl b/java/common/rules/java_runtime.bzl index fa0bd52..52b1301 100644 --- a/java/common/rules/java_runtime.bzl +++ b/java/common/rules/java_runtime.bzl
@@ -184,10 +184,8 @@ cfg = "target", doc = """ Default CDS archive for hermetic <code>java_runtime</code>. When hermetic -is enabled for a <code>java_binary</code> target and if the target does not -provide its own CDS archive by specifying the -<a href="${link java_binary.classlist}"><code>classlist</code></a> attribute, -the <code>java_runtime</code> default CDS is packaged in the hermetic deploy JAR. +is enabled for a <code>java_binary</code> target the <code>java_runtime</code> +default CDS is packaged in the hermetic deploy JAR. """, ), "hermetic_srcs": attr.label_list(