forked from bazelbuild/bazel
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Patched rules_java to use remote_jdk11 as default toolchain.
Summary: Patched rules_java to use remote_jdk11 as default toolchain. Test Plan: Tested with java-monorepo. Diff: https://code.uberinternal.com/D13219185 CI-Job: https://buildkite.com/uber/java-code-differential/builds/3217038 Reviewers: cjk, ravi JIRA Issues: JAVADEVX-8295 Differential Revision: https://code.uberinternal.com/D13309949
- Loading branch information
1 parent
5fb7831
commit f334115
Showing
4 changed files
with
67 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
licenses(["notice"]) | ||
|
||
exports_files(glob(["*.patch"])) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
diff --git a/toolchains/default_java_toolchain.bzl b/toolchains/default_java_toolchain.bzl | ||
index 47cb877..a713aec 100644 | ||
--- a/toolchains/default_java_toolchain.bzl | ||
+++ b/toolchains/default_java_toolchain.bzl | ||
@@ -48,6 +48,7 @@ BASE_JDK9_JVM_OPTS = [ | ||
# makes it go to stderr instead. | ||
"-Xlog:disable", | ||
"-Xlog:all=warning:stderr:uptime,level,tags", | ||
+ "-Xss4m", | ||
] | ||
|
||
JDK9_JVM_OPTS = BASE_JDK9_JVM_OPTS | ||
@@ -92,7 +93,7 @@ _BASE_TOOLCHAIN_CONFIGURATION = dict( | ||
reduced_classpath_incompatible_processors = [ | ||
"dagger.hilt.processor.internal.root.RootProcessor", # see b/21307381 | ||
], | ||
- java_runtime = Label("//toolchains:remotejdk_21"), | ||
+ java_runtime = Label("//toolchains:remote_jdk11"), | ||
) | ||
|
||
DEFAULT_TOOLCHAIN_CONFIGURATION = _BASE_TOOLCHAIN_CONFIGURATION |