Remove unused bind calls from jdk.WORKSPACE
These are unused in Bazel (after fixing one test), and aren't used in any downstream projects: https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/1705 (the rules_haskell failure is unrelated and happens at head as well).
Closes #12291.
PiperOrigin-RevId: 337573608
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 23e4fe2..fc3e93a 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
@@ -8,85 +8,6 @@
java_home = DEFAULT_SYSTEM_JAVABASE,
)
-bind(
- name = "bootclasspath",
- actual = "@local_jdk//:bootclasspath",
-)
-
-# TODO(cushon): migrate to extclasspath and delete
-bind(
- name = "extdir",
- actual = "@local_jdk//:extdir",
-)
-
-bind(
- name = "extclasspath",
- actual = "@local_jdk//:extdir",
-)
-
-bind(
- name = "jni_header",
- actual = "@local_jdk//:jni_header",
-)
-
-bind(
- name = "jni_md_header-darwin",
- actual = "@local_jdk//:jni_md_header-darwin",
-)
-
-bind(
- name = "jni_md_header-linux",
- actual = "@local_jdk//:jni_md_header-linux",
-)
-
-bind(
- name = "jni_md_header-freebsd",
- actual = "@local_jdk//:jni_md_header-freebsd",
-)
-
-bind(
- name = "jni_md_header-openbsd",
- actual = "@local_jdk//:jni_md_header-openbsd",
-)
-
-bind(
- name = "java",
- actual = "@local_jdk//:java",
-)
-
-bind(
- name = "jar",
- actual = "@local_jdk//:jar",
-)
-
-bind(
- name = "javac",
- actual = "@local_jdk//:javac",
-)
-
-bind(
- name = "jre",
- actual = "@local_jdk//:jre",
-)
-
-bind(
- name = "jdk",
- actual = "@local_jdk//:jdk",
-)
-
-# TODO: Remove these two rules after we've migrated. In order to properly look
-# up Jdks/Jres for cross-platform builds, the lookup needs to happen in the Jdk
-# repository. For now, use an alias rule that redirects to //external:{jre,jdk}.
-bind(
- name = "jre-default",
- actual = "@local_jdk//:jre",
-)
-
-bind(
- name = "jdk-default",
- actual = "@local_jdk//:jdk",
-)
-
# OpenJDK distributions that should only be downloaded on demand (e.g. when
# building a java_library or a genrule that uses java make variables).
# This will allow us to stop bundling the full JDK with Bazel.
diff --git a/src/test/shell/bazel/local_repository_test.sh b/src/test/shell/bazel/local_repository_test.sh
index 860bd29..094cbe3 100755
--- a/src/test/shell/bazel/local_repository_test.sh
+++ b/src/test/shell/bazel/local_repository_test.sh
@@ -302,8 +302,8 @@
}
function test_default_ws() {
- bazel fetch //external:java || fail "Fetch failed"
- bazel build //external:java >& $TEST_log || fail "Failed to build java"
+ bazel fetch //external:main || fail "Fetch failed"
+ bazel build //external:main >& $TEST_log || fail "Failed to build java"
}
function test_external_hdrs() {
