From e1d74669d0d7d9a14beaf17236094712a7443967 Mon Sep 17 00:00:00 2001 From: Googler Date: Fri, 23 Aug 2024 01:57:10 -0700 Subject: [PATCH] Revert https://github.com/bazelbuild/rules_java/commit/18e8c3b79fde5eff093ddc9f4add91df586ec63e PiperOrigin-RevId: 666698763 Change-Id: Ied733f052b47f6e869353c4126307576e4155598 --- java/private/proto_support.bzl | 12 ++++++++---- java/private/proto_support.bzl.oss | 25 ------------------------- 2 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 java/private/proto_support.bzl.oss diff --git a/java/private/proto_support.bzl b/java/private/proto_support.bzl index 8dd644c..8666e5a 100644 --- a/java/private/proto_support.bzl +++ b/java/private/proto_support.bzl @@ -13,9 +13,13 @@ # limitations under the License. """Support for Java compilation of protocol buffer generated code.""" -_legacy_api = _legacy_api_DO_NOT_USE_OR_ELSE() +load("//java/private:native.bzl", "native_java_common") -visibility(["//third_party/protobuf/..."]) +# Partial support, because internal symbols are not available in older Bazel version +# TODO: Once Java rules are moved into the rules_java, this should become a full support. -compile = _legacy_api.java_compile_for_protos -merge = _legacy_api.java_info_merge_for_protos +def compile(*, injecting_rule_kind, enable_jspecify, include_compilation_info, **kwargs): # buildifier: disable=unused-variable + return native_java_common.compile(**kwargs) + +def merge(providers, *, merge_java_outputs = True, merge_source_jars = True): # buildifier: disable=unused-variable + return native_java_common.merge(providers) diff --git a/java/private/proto_support.bzl.oss b/java/private/proto_support.bzl.oss deleted file mode 100644 index bb94cca..0000000 --- a/java/private/proto_support.bzl.oss +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2024 The Bazel Authors. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -"""Support for Java compilation of protocol buffer generated code.""" - -load("//third_party/bazel_rules/rules_java/java/private:native.bzl", "native_java_common") - -# Partial support, because internal symbols are not available in older Bazel version -# TODO: Once Java rules are moved into the rules_java, this should become a full support. - -def compile(*, injecting_rule_kind, enable_jspecify, include_compilation_info, **kwargs): # buildifier: disable=unused-variable - return native_java_common.compile(**kwargs) - -def merge(providers, *, merge_java_outputs = True, merge_source_jars = True): # buildifier: disable=unused-variable - return native_java_common.merge(providers)