Skip to content

Commit 4f50c3b

Browse files
fmeumcopybara-github
authored andcommitted
Wire up oneversion in Java toolchain configurations
Copybara Import from #206 BEGIN_PUBLIC Wire up `oneversion` in Java toolchain configurations (#206) Closes #206 END_PUBLIC COPYBARA_INTEGRATE_REVIEW=#206 from fmeum:one_version d65f3d0 PiperOrigin-RevId: 671012643 Change-Id: Ica0aa0053cd8b3ac7e2b882006e9e0b0d98da94b
1 parent bcc5062 commit 4f50c3b

3 files changed

Lines changed: 35 additions & 0 deletions

File tree

MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ bazel_dep(name = "bazel_skylib", version = "1.6.1")
1313
# Required by @remote_java_tools, which is loaded via module extension.
1414
bazel_dep(name = "rules_proto", version = "4.0.0")
1515
bazel_dep(name = "rules_license", version = "0.0.3")
16+
bazel_dep(name = "abseil-cpp", version = "20240116.2", repo_name = "com_google_absl")
1617

1718
register_toolchains("//toolchains:all")
1819

toolchains/BUILD

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,11 @@ cc_library(
160160
actual = "@remote_java_tools_%s//:prebuilt_singlejar" % OS,
161161
visibility = ["//visibility:private"],
162162
),
163+
alias(
164+
name = "prebuilt_one_version_%s" % OS,
165+
actual = "@remote_java_tools_%s//:prebuilt_one_version" % OS,
166+
visibility = ["//visibility:private"],
167+
),
163168
alias(
164169
name = "turbine_direct_graal_%s" % OS,
165170
actual = "@remote_java_tools_%s//:turbine_direct_graal" % OS,
@@ -225,6 +230,32 @@ alias(
225230
}),
226231
)
227232

233+
alias(
234+
name = "one_version",
235+
actual = ":one_version_prebuilt_or_cc_binary",
236+
)
237+
238+
alias(
239+
name = "one_version_prebuilt_or_cc_binary",
240+
actual = select({
241+
"@bazel_tools//src/conditions:darwin_arm64": ":prebuilt_one_version_darwin_arm64",
242+
"@bazel_tools//src/conditions:darwin_x86_64": ":prebuilt_one_version_darwin_x86_64",
243+
"@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_one_version_linux",
244+
"@bazel_tools//src/conditions:windows": ":prebuilt_one_version_windows",
245+
"//conditions:default": "@remote_java_tools//:one_version_cc_bin",
246+
}),
247+
)
248+
249+
alias(
250+
name = "prebuilt_one_version",
251+
actual = select({
252+
"@bazel_tools//src/conditions:darwin_arm64": ":prebuilt_one_version_darwin_arm64",
253+
"@bazel_tools//src/conditions:darwin_x86_64": ":prebuilt_one_version_darwin_x86_64",
254+
"@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_one_version_linux",
255+
"@bazel_tools//src/conditions:windows": ":prebuilt_one_version_windows",
256+
}),
257+
)
258+
228259
alias(
229260
name = "turbine_direct",
230261
actual = ":turbine_direct_graal_or_java",

toolchains/default_java_toolchain.bzl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ _BASE_TOOLCHAIN_CONFIGURATION = dict(
9494
"dagger.hilt.processor.internal.root.RootProcessor", # see b/21307381
9595
],
9696
java_runtime = Label("//toolchains:remotejdk_21"),
97+
oneversion = Label("//toolchains:one_version"),
9798
)
9899

99100
DEFAULT_TOOLCHAIN_CONFIGURATION = _BASE_TOOLCHAIN_CONFIGURATION
@@ -125,13 +126,15 @@ VANILLA_TOOLCHAIN_CONFIGURATION = dict(
125126
PREBUILT_TOOLCHAIN_CONFIGURATION = dict(
126127
ijar = [Label("//toolchains:ijar_prebuilt_binary")],
127128
singlejar = [Label("//toolchains:prebuilt_singlejar")],
129+
oneversion = Label("//toolchains:prebuilt_one_version"),
128130
)
129131

130132
# The new toolchain is using all the tools from sources.
131133
NONPREBUILT_TOOLCHAIN_CONFIGURATION = dict(
132134
ijar = [Label("@remote_java_tools//:ijar_cc_binary")],
133135
singlejar = [Label("@remote_java_tools//:singlejar_cc_bin")],
134136
header_compiler_direct = [Label("@remote_java_tools//:TurbineDirect")],
137+
oneversion = Label("@remote_java_tools//:one_version_cc_bin"),
135138
)
136139

137140
# If this is changed, the docs for "{,tool_}java_language_version" also

0 commit comments

Comments
 (0)