Skip to content

Commit ee235bf

Browse files
gkdncopybara-github
authored andcommitted
Simplify java_library target definitions since they are now only supported in Bazel.
PiperOrigin-RevId: 781382304
1 parent 596516a commit ee235bf

File tree

2 files changed

+16
-36
lines changed

2 files changed

+16
-36
lines changed

jsinterop_generator.bzl

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ load("@rules_java//java:defs.bzl", "java_library")
3535
load("@com_google_j2cl//build_defs:rules.bzl", "j2cl_library")
3636
load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")
3737

38-
_is_bazel = not hasattr(native, "genmpm") # this_is_bazel
39-
4038
JS_INTEROP_RULE_NAME_PATTERN = "%s__internal_src_generated"
4139

4240
JsInteropGeneratorInfo = provider()
@@ -370,23 +368,15 @@ def jsinterop_generator(
370368
)
371369

372370
if generate_gwt_library:
373-
java_library_args = {
374-
"name": name,
375-
"srcs": generated_jars,
376-
"deps": deps_java,
377-
"exports": exports_java,
378-
"visibility": visibility,
379-
"testonly": testonly,
380-
}
381-
382-
# bazel doesn't support constraint and gwtxml attributes
383-
if _is_bazel:
384-
if gwt_xml_file:
385-
java_library_args["resources"] = [gwt_xml_file]
386-
else:
387-
java_library_args["gwtxml"] = gwt_xml_file
388-
java_library_args["constraints"] = ["gwt", "public"]
389-
java_library(**java_library_args)
371+
java_library(
372+
name = name,
373+
srcs = generated_jars,
374+
deps = deps_java,
375+
exports = exports_java,
376+
resources = [gwt_xml_file] if gwt_xml_file else [],
377+
visibility = visibility,
378+
testonly = testonly,
379+
)
390380

391381
_extract_srcjar(
392382
name = name + "_generated_files",

jsinterop_generator_import.bzl

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ load("@rules_java//java:defs.bzl", "java_library")
99
load("@com_google_j2cl//build_defs:rules.bzl", "j2cl_library")
1010
load(":jsinterop_generator.bzl", "JS_INTEROP_RULE_NAME_PATTERN", "JsInteropGeneratorInfo")
1111

12-
_is_bazel = not hasattr(native, "genmpm") # this_is_bazel
13-
1412
def _jsinterop_generator_import_impl(ctx):
1513
# expose files and properties used when the target is used as dependency
1614
return [
@@ -47,25 +45,17 @@ def jsinterop_generator_import(
4745
gwt_module_name = gwt_module_name,
4846
)
4947

50-
java_library_args = {
51-
"name": name,
52-
"srcs": srcs,
53-
"deps": [
48+
java_library(
49+
name = name,
50+
srcs = srcs,
51+
deps = [
5452
Label("@com_google_j2cl//:jsinterop-annotations"),
5553
Label("@com_google_jsinterop_base//:jsinterop-base"),
5654
Label("//third_party:jspecify_annotations"),
5755
],
58-
"visibility": visibility,
59-
}
60-
61-
if gwt_xml:
62-
# bazel doesn't support constraint and gwtxml attributes
63-
if _is_bazel:
64-
java_library_args["resources"] = [gwt_xml]
65-
else:
66-
java_library_args["gwtxml"] = gwt_xml
67-
java_library_args["constraints"] = ["gwt", "public"]
68-
java_library(**java_library_args)
56+
resources = [gwt_xml] if gwt_xml else [],
57+
visibility = visibility,
58+
)
6959

7060
j2cl_library(
7161
name = "%s-j2cl" % name,

0 commit comments

Comments
 (0)