Skip to content

Commit 250bbdc

Browse files
pzembrodrules_java Copybara
authored andcommitted
Switch rules_java back to more named params (quasi-rollback of unknown commit)
PiperOrigin-RevId: 728089692 Change-Id: I76cbe64fbcb422c67db62e87f0bc5eba675191ee
1 parent 31edc44 commit 250bbdc

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

java/common/rules/impl/basic_java_library_impl.bzl

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -126,23 +126,23 @@ def basic_java_library(
126126

127127
java_info, compilation_info = compile_action(
128128
ctx,
129-
ctx.outputs.classjar,
130-
ctx.outputs.sourcejar,
131-
source_files,
132-
source_jars,
133-
collect_deps(deps) + ([coverage_config.runner] if coverage_config and coverage_config.runner else []),
134-
collect_deps(runtime_deps),
135-
plugins_javaplugininfo,
136-
collect_deps(exports),
137-
_collect_plugins(exported_plugins),
138-
resources,
139-
resource_jars,
140-
classpath_resources,
141-
_collect_native_libraries(deps, runtime_deps, exports),
142-
javacopts,
143-
neverlink,
144-
ctx.fragments.java.strict_java_deps,
145-
enable_compile_jar_action,
129+
output_class_jar = ctx.outputs.classjar,
130+
output_source_jar = ctx.outputs.sourcejar,
131+
source_files = source_files,
132+
source_jars = source_jars,
133+
deps = collect_deps(deps) + ([coverage_config.runner] if coverage_config and coverage_config.runner else []),
134+
runtime_deps = collect_deps(runtime_deps),
135+
plugins = plugins_javaplugininfo,
136+
exports = collect_deps(exports),
137+
exported_plugins = _collect_plugins(exported_plugins),
138+
resources = resources,
139+
resource_jars = resource_jars,
140+
classpath_resources = classpath_resources,
141+
native_libraries = _collect_native_libraries(deps, runtime_deps, exports),
142+
javacopts = javacopts,
143+
neverlink = neverlink,
144+
strict_deps = ctx.fragments.java.strict_java_deps,
145+
enable_compile_jar_action = enable_compile_jar_action,
146146
add_exports = add_exports,
147147
add_opens = add_opens,
148148
bootclasspath = bootclasspath[BootClassPathInfo] if bootclasspath else None,

java/common/rules/impl/bazel_java_library_impl.bzl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,17 @@ def bazel_java_library_rule(
6767

6868
target, base_info = basic_java_library(
6969
ctx,
70-
srcs,
71-
deps,
72-
runtime_deps,
73-
plugins,
74-
exports,
75-
exported_plugins,
76-
resources,
77-
[], # resource_jars
78-
[], # class_pathresources
79-
javacopts,
80-
neverlink,
70+
srcs = srcs,
71+
deps = deps,
72+
runtime_deps = runtime_deps,
73+
plugins = plugins,
74+
exports = exports,
75+
exported_plugins = exported_plugins,
76+
resources = resources,
77+
resource_jars = [],
78+
classpath_resources = [],
79+
javacopts = javacopts,
80+
neverlink = neverlink,
8181
proguard_specs = proguard_specs,
8282
add_exports = add_exports,
8383
add_opens = add_opens,

java/private/java_common.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ def _compile(
7070
add_opens = []):
7171
return _compile_internal(
7272
ctx,
73-
output,
74-
java_toolchain,
73+
output = output,
74+
java_toolchain = java_toolchain,
7575
source_jars = source_jars,
7676
source_files = source_files,
7777
output_source_jar = output_source_jar,

0 commit comments

Comments
 (0)