Skip to content

Commit 15b8e3f

Browse files
hvadehracopybara-github
authored andcommitted
Make the removed java symbols compatible with WORKSPACE loading
Context: bazel-contrib/rules_scala#1652 (comment) This will fix the issue in Bazel@HEAD, and the primary motivation is to turn downstream CI green. On the off-chance we are making a new Bazel 8 RC, we can include this. Otherwise, maybe this can go in 8.1.0 PiperOrigin-RevId: 701260369 Change-Id: If62eb015b5220b574ce34a26a194d2722021082f
1 parent e0738ff commit 15b8e3f

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

src/main/starlark/builtins_bzl/bazel/exports.bzl

+4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@
1515
"""Exported builtins symbols that are specific to OSS Bazel."""
1616

1717
load("@_builtins//:common/python/py_internal.bzl", "py_internal")
18+
load(":common/java/java_common.bzl", "java_common_export_for_bazel")
1819

1920
exported_toplevels = {
2021
"py_internal": py_internal,
2122
"proto_common_do_not_use": struct(INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION = _builtins.toplevel.proto_common_do_not_use.incompatible_enable_proto_toolchain_resolution()),
23+
"java_common": java_common_export_for_bazel,
24+
"JavaInfo": java_common_export_for_bazel.provider,
25+
"JavaPluginInfo": java_common_export_for_bazel.JavaPluginInfo,
2226
}
2327
exported_rules = {}
2428
exported_to_java = {}

src/main/starlark/builtins_bzl/common/exports.bzl

-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ load(":common/cc/fdo/fdo_prefetch_hints.bzl", "fdo_prefetch_hints")
3636
load(":common/cc/fdo/fdo_profile.bzl", "fdo_profile")
3737
load(":common/cc/fdo/memprof_profile.bzl", "memprof_profile")
3838
load(":common/cc/fdo/propeller_optimize.bzl", "propeller_optimize")
39-
load(":common/java/java_common.bzl", "java_common")
4039
load(":common/objc/apple_common.bzl", "apple_common")
4140
load(":common/objc/objc_common.bzl", "objc_common")
4241

@@ -48,7 +47,6 @@ exported_toplevels = {
4847
"CcSharedLibraryInfo": CcSharedLibraryInfo,
4948
"CcSharedLibraryHintInfo": CcSharedLibraryHintInfo,
5049
"cc_common": cc_common,
51-
"java_common": struct(internal_DO_NOT_USE = java_common.internal_DO_NOT_USE),
5250
"apple_common": apple_common,
5351
}
5452

src/main/starlark/builtins_bzl/common/java/java_common.bzl

+18
Original file line numberDiff line numberDiff line change
@@ -346,3 +346,21 @@ def _make_java_common():
346346
return struct(**methods)
347347

348348
java_common = _make_java_common()
349+
350+
_FakeJavaInfo = provider() # buildifier: disable=provider-params
351+
_FakeJavaPluginInfo = provider() # buildifier: disable=provider-params
352+
_FakeJavaToolchainInfo = provider() # buildifier: disable=provider-params
353+
_FakeJavaRuntimeInfo = provider() # buildifier: disable=provider-params
354+
_FakeBootClassPathInfo = provider() # buildifier: disable=provider-params
355+
_FakeJavaRuntimeClasspathInfo = provider() # buildifier: disable=provider-params
356+
357+
java_common_export_for_bazel = struct(
358+
internal_DO_NOT_USE = _internal_exports,
359+
# fake exports for WORKSPACE loading
360+
provider = _FakeJavaInfo,
361+
JavaPluginInfo = _FakeJavaPluginInfo,
362+
JavaToolchainInfo = _FakeJavaToolchainInfo,
363+
JavaRuntimeInfo = _FakeJavaRuntimeInfo,
364+
BootClassPathInfo = _FakeBootClassPathInfo,
365+
JavaRuntimeClasspathInfo = _FakeJavaRuntimeClasspathInfo,
366+
)

0 commit comments

Comments
 (0)