Skip to content

Commit e1d7466

Browse files
hvadehracopybara-github
authored andcommitted
Revert 18e8c3b
PiperOrigin-RevId: 666698763 Change-Id: Ied733f052b47f6e869353c4126307576e4155598
1 parent 18e8c3b commit e1d7466

File tree

2 files changed

+8
-29
lines changed

2 files changed

+8
-29
lines changed

java/private/proto_support.bzl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@
1313
# limitations under the License.
1414
"""Support for Java compilation of protocol buffer generated code."""
1515

16-
_legacy_api = _legacy_api_DO_NOT_USE_OR_ELSE()
16+
load("//java/private:native.bzl", "native_java_common")
1717

18-
visibility(["//third_party/protobuf/..."])
18+
# Partial support, because internal symbols are not available in older Bazel version
19+
# TODO: Once Java rules are moved into the rules_java, this should become a full support.
1920

20-
compile = _legacy_api.java_compile_for_protos
21-
merge = _legacy_api.java_info_merge_for_protos
21+
def compile(*, injecting_rule_kind, enable_jspecify, include_compilation_info, **kwargs): # buildifier: disable=unused-variable
22+
return native_java_common.compile(**kwargs)
23+
24+
def merge(providers, *, merge_java_outputs = True, merge_source_jars = True): # buildifier: disable=unused-variable
25+
return native_java_common.merge(providers)

java/private/proto_support.bzl.oss

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)