| commit | c84be50abe8d8d7dea50a2865062a5c50e18abe5 | [log] [tgz] |
|---|---|---|
| author | cushon <cushon@google.com> | Fri Feb 15 16:52:54 2019 -0800 |
| committer | Copybara-Service <copybara-worker@google.com> | Fri Feb 15 16:54:46 2019 -0800 |
| tree | ce8ab4fa8a14756f8a49f614e9d8cd9b2bf7498a | |
| parent | 4f00eace48ca8342139d80d3149c04e20227e0a7 [diff] |
Register all toolchains in the tools/jdk package PiperOrigin-RevId: 234238138
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/JavaRules.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/JavaRules.java index 7c19179..92ebf3c 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/JavaRules.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/JavaRules.java
@@ -97,10 +97,6 @@ try { builder.addWorkspaceFileSuffix( ResourceFileLoader.loadResource(BazelJavaRuleClasses.class, "jdk.WORKSPACE")); - builder.addWorkspaceFileSuffix( - "register_toolchains('@bazel_tools//tools/jdk:dummy_java_toolchain')\n"); - builder.addWorkspaceFileSuffix( - "register_toolchains('@bazel_tools//tools/jdk:dummy_java_runtime_toolchain')\n"); } catch (IOException e) { throw new IllegalStateException(e); }
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE index 10c7ce1..5e203a8 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE
@@ -213,3 +213,5 @@ "https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.3.tar.gz", ], ) + +register_toolchains('@bazel_tools//tools/jdk:all')