diff options
| author |  cushon <cushon@google.com> | 2018-08-07 02:59:30 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-08-07 03:00:59 -0700 |
| commit | 808ec9ff9b5cec14f23a4ba106bc5249cacc8c54 (patch) | |
| tree | cee3449c2132f75abd17efb35ea8c913d503c591 /src/main/java/com/google/devtools/build/lib/bazel | |
| parent | f203272ad93c9fa6239a37532c9ecbe0bdb9e70f (diff) | |
Clean up Java toolchain configuration
now that JDK 8 host_javabases are no longer supported.
PiperOrigin-RevId: 207687089
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/bazel')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java | 15 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/tools.WORKSPACE | 1 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java index e4659e9ebf..2b81f74ff1 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java @@ -46,16 +46,7 @@ public class GenericRules implements RuleSet { try { builder.addWorkspaceFilePrefix( - ResourceFileLoader.loadResource(BazelRuleClassProvider.class, "tools.WORKSPACE") - // Hackily select the java_toolchain based on the host JDK version. JDK 8 and - // 9 host_javabases require different toolchains, e.g. to use --patch-module - // instead of -Xbootclasspath/p:. - .replace( - "%java_toolchain%", - isJdk8OrEarlier() - ? "@bazel_tools//tools/jdk:toolchain_hostjdk8" - : "@bazel_tools//tools/jdk:toolchain_hostjdk10")); - + ResourceFileLoader.loadResource(BazelRuleClassProvider.class, "tools.WORKSPACE")); } catch (IOException e) { throw new IllegalStateException(e); } @@ -65,8 +56,4 @@ public class GenericRules implements RuleSet { public ImmutableList<RuleSet> requires() { return ImmutableList.of(CoreRules.INSTANCE); } - - private static boolean isJdk8OrEarlier() { - return Double.parseDouble(System.getProperty("java.class.version")) <= 52.0; - } } diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/tools.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/tools.WORKSPACE index 49f1b5d85a..b080717b43 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/tools.WORKSPACE +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/tools.WORKSPACE @@ -1,3 +1,2 @@ local_repository(name = "bazel_tools", path = __embedded_dir__ + "/embedded_tools") bind(name = "cc_toolchain", actual = "@bazel_tools//tools/cpp:default-toolchain") -bind(name = "java_toolchain", actual = "%java_toolchain%") |