Skip to content

Commit a04ab3c

Browse files
cushonrules_java Copybara
authored and
rules_java Copybara
committed
Remove java_binary.classlist
PiperOrigin-RevId: 702233460 Change-Id: I008dbf4d484b03d484ebc6882634191e7a72461c
1 parent c22454f commit a04ab3c

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

java/common/rules/impl/java_binary_deploy_jar.bzl

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ def create_deploy_archives(
3838
hermetic = False,
3939
add_exports = depset(),
4040
add_opens = depset(),
41-
shared_archive = None,
4241
one_version_level = "OFF",
4342
one_version_allowlist = None,
4443
extra_args = [],
@@ -55,7 +54,6 @@ def create_deploy_archives(
5554
hermetic: (bool)
5655
add_exports: (depset)
5756
add_opens: (depset)
58-
shared_archive: (File) Optional .jsa artifact
5957
one_version_level: (String) Optional one version check level, default OFF
6058
one_version_allowlist: (File) Optional allowlist for one version check
6159
extra_args: (list[Args]) Optional arguments for the deploy jar action
@@ -87,7 +85,6 @@ def create_deploy_archives(
8785
build_info_files,
8886
build_target,
8987
output = ctx.outputs.deployjar,
90-
shared_archive = shared_archive,
9188
one_version_level = one_version_level,
9289
one_version_allowlist = one_version_allowlist,
9390
multi_release = multi_release,
@@ -131,7 +128,6 @@ def create_deploy_archive(
131128
build_info_files,
132129
build_target,
133130
output,
134-
shared_archive = None,
135131
one_version_level = "OFF",
136132
one_version_allowlist = None,
137133
multi_release = False,
@@ -156,7 +152,6 @@ def create_deploy_archive(
156152
build_info_files: (list[File]) build info files for stamping
157153
build_target: (String) the owner build target label name string
158154
output: (File) the output jar artifact
159-
shared_archive: (File) Optional .jsa artifact
160155
one_version_level: (String) Optional one version check level, default OFF
161156
one_version_allowlist: (File) Optional allowlist for one version check
162157
multi_release: (bool)
@@ -217,18 +212,15 @@ def create_deploy_archive(
217212
java_home = runtime.java_home
218213
lib_modules = runtime.lib_modules
219214
hermetic_files = runtime.hermetic_files
215+
default_cds = runtime.default_cds
220216
args.add("--hermetic_java_home", java_home)
221217
args.add("--jdk_lib_modules", lib_modules)
222218
args.add_all("--resources", hermetic_files)
223219
input_files.append(lib_modules)
224220
transitive_input_files.append(hermetic_files)
225-
226-
if shared_archive == None:
227-
shared_archive = runtime.default_cds
228-
229-
if shared_archive:
230-
input_files.append(shared_archive)
231-
args.add("--cds_archive", shared_archive)
221+
if default_cds:
222+
input_files.append(default_cds)
223+
args.add("--cds_archive", default_cds)
232224

233225
args.add_all("--add_exports", add_exports)
234226
args.add_all("--add_opens", add_opens)

java/common/rules/java_runtime.bzl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,8 @@ java_runtime(
184184
cfg = "target",
185185
doc = """
186186
Default CDS archive for hermetic <code>java_runtime</code>. When hermetic
187-
is enabled for a <code>java_binary</code> target and if the target does not
188-
provide its own CDS archive by specifying the
189-
<a href="${link java_binary.classlist}"><code>classlist</code></a> attribute,
190-
the <code>java_runtime</code> default CDS is packaged in the hermetic deploy JAR.
187+
is enabled for a <code>java_binary</code> target the <code>java_runtime</code>
188+
default CDS is packaged in the hermetic deploy JAR.
191189
""",
192190
),
193191
"hermetic_srcs": attr.label_list(

0 commit comments

Comments
 (0)