Avoid using //external labels; use @local_jdk// instead -- PiperOrigin-RevId: 147449557 MOS_MIGRATED_REVID=147449557
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index fd5ba5f..08f4401 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD
@@ -27,9 +27,6 @@ "testing_server.py", ":langtools-copy", "//examples:srcs", - "//external:bootclasspath", - "//external:extdir", - "//external:jdk-default", "//src:bazel", "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar", "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar", @@ -44,6 +41,9 @@ "//third_party/ijar", "//third_party/java/jdk/langtools:test-srcs", "//tools:srcs", + "@local_jdk//:bootclasspath", + "@local_jdk//:extdir", + "@local_jdk//:jdk", ], visibility = [ "//src/test/shell:__subpackages__",
diff --git a/src/tools/singlejar/BUILD b/src/tools/singlejar/BUILD index 704bf9f..588efef 100644 --- a/src/tools/singlejar/BUILD +++ b/src/tools/singlejar/BUILD
@@ -78,8 +78,8 @@ ], copts = ["-DJAR_TOOL_PATH=\\\"external/local_jdk/bin/jar\\\""], data = [ - "//external:jar", - "//external:jdk-default", + "@local_jdk//:jar", + "@local_jdk//:jdk", ], # Timing out, see https://github.com/bazelbuild/bazel/issues/1555 tags = ["manual"], @@ -158,8 +158,8 @@ ":stored_jar", ":test1", ":test2", - "//external:jar", - "//external:jdk-default", + "@local_jdk//:jar", + "@local_jdk//:jdk-default", ], deps = [ ":input_jar", @@ -230,12 +230,12 @@ args = [ "src/test/shell", "$(location :singlejar)", - "$(location //external:jar)", + "$(location @local_jdk//:jar)", ], data = [ ":singlejar", - "//external:jar", "//tools/defaults:jdk", + "@local_jdk//:jar", ], deps = ["//src/test/shell:bashunit"], ) @@ -375,6 +375,6 @@ "//tools/defaults:jdk", ], outs = ["stored.jar"], - cmd = "$(location //external:jar) -0cf \"$@\" $(location :output_jar.cc)", - tools = ["//external:jar"], + cmd = "$(location @local_jdk//:jar) -0cf \"$@\" $(location :output_jar.cc)", + tools = ["@local_jdk//:jar"], )
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index 3d1758a..b717f9f 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD
@@ -22,37 +22,37 @@ alias( name = "jni_header", - actual = "//external:jni_header", + actual = "@local_jdk//:jni_header", ) alias( name = "jni_md_header-darwin", - actual = "//external:jni_md_header-darwin", + actual = "@local_jdk//:jni_md_header-darwin", ) alias( name = "jni_md_header-linux", - actual = "//external:jni_md_header-linux", + actual = "@local_jdk//:jni_md_header-linux", ) alias( name = "jni_md_header-freebsd", - actual = "//external:jni_md_header-freebsd", + actual = "@local_jdk//:jni_md_header-freebsd", ) alias( name = "java", - actual = "//external:java", + actual = "@local_jdk//:java", ) alias( name = "jar", - actual = "//external:jar", + actual = "@local_jdk//:jar", ) alias( name = "javac", - actual = "//external:javac", + actual = "@local_jdk//:javac", ) # On Windows, executables end in ".exe", but the label we reach it through @@ -73,12 +73,12 @@ alias( name = "bootclasspath", - actual = "//external:bootclasspath", + actual = "@local_jdk//:bootclasspath", ) alias( name = "extdir", - actual = "//external:extdir", + actual = "@local_jdk//:extdir", ) filegroup( @@ -94,12 +94,12 @@ alias( name = "jre", - actual = "//external:jre", + actual = "@local_jdk//:jre", ) alias( name = "jdk", - actual = "//external:jdk", + actual = "@local_jdk//:jdk", ) java_toolchain(