From f77415dd1c2802111b95b6c06244518d3c92acb2 Mon Sep 17 00:00:00 2001 From: iirina Date: Mon, 1 Jul 2019 09:53:21 +0200 Subject: [PATCH 1/8] Use java macros in java_tools. --- src/BUILD | 8 ++++++++ tools/jdk/BUILD | 3 ++- tools/jdk/BUILD.java_tools | 2 ++ tools/jdk/WORKSPACE.java_tools | 7 +++++++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 tools/jdk/WORKSPACE.java_tools diff --git a/src/BUILD b/src/BUILD index c002a45d66924b..07bfddd550c948 100644 --- a/src/BUILD +++ b/src/BUILD @@ -650,6 +650,13 @@ JAVA_VERSIONS = ("9", "10", "11", "12") for java_version in JAVA_VERSIONS ] +genrule( + name = "create_java_tools_workspace_file_zip", + srcs = ["//tools/jdk:WORKSPACE.java_tools"], + outs = ["java_tools_workspace.zip"], + cmd = "cp $< WORKSPACE && zip -jX $@ WORKSPACE", +) + [ genrule( name = "java_tools_java" + java_version + "_build_zip", @@ -687,6 +694,7 @@ JAVA_VERSIONS = ("9", "10", "11", "12") srcs = [ "java_tools_java" + java_version + "_no_build.zip", "java_tools_java_" + java_version + "_build.zip", + ":java_tools_workspace.zip" ], outs = ["java_tools_java" + java_version + ".zip"], cmd = "$(location //src:merge_zip_files) - $@ $(SRCS)", diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index ad758b68006e5a..b0a0e40e87fa04 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -152,7 +152,7 @@ remote_java_tools_filegroup( target = ":singlejar", ) -exports_files(["BUILD.java_tools"]) +exports_files(["BUILD.java_tools", "WORKSPACE.java_tools"]) remote_java_tools_filegroup( name = "genclass", @@ -403,6 +403,7 @@ filegroup( "proguard_whitelister_test_input.cfg", "remote_java_tools_aliases.bzl", "toolchain_utils.bzl", + "WORKSPACE.java_tools" ], ) diff --git a/tools/jdk/BUILD.java_tools b/tools/jdk/BUILD.java_tools index 298f8607196306..b73a288b7920e5 100644 --- a/tools/jdk/BUILD.java_tools +++ b/tools/jdk/BUILD.java_tools @@ -2,6 +2,8 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) # Apache 2.0 +load("@rules_java//java:defs.bzl", "java_toolchain", "java_import", "java_binary") + java_toolchain( name = "toolchain", bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath"], diff --git a/tools/jdk/WORKSPACE.java_tools b/tools/jdk/WORKSPACE.java_tools new file mode 100644 index 00000000000000..e76fc27dca0f3b --- /dev/null +++ b/tools/jdk/WORKSPACE.java_tools @@ -0,0 +1,7 @@ +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + +http_archive( + name = "rules_java", + sha256 = "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + urls = ["https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"], +) \ No newline at end of file From 73d2e3a28d84deac3b4f76ef9b62b02ff16413e8 Mon Sep 17 00:00:00 2001 From: iirina Date: Mon, 1 Jul 2019 11:48:24 +0200 Subject: [PATCH 2/8] Add rules_java to the test setup. --- src/test/shell/bazel/bazel_java_test.sh | 3 +++ src/test/shell/bazel/bazel_java_tools_test.sh | 22 +++++++++++++++++++ .../shell/bazel/testdata/jdk_http_archives | 7 ++++++ tools/jdk/WORKSPACE.java_tools | 1 + 4 files changed, 33 insertions(+) diff --git a/src/test/shell/bazel/bazel_java_test.sh b/src/test/shell/bazel/bazel_java_test.sh index a867f19ccffbce..a411c7fbc36628 100755 --- a/src/test/shell/bazel/bazel_java_test.sh +++ b/src/test/shell/bazel/bazel_java_test.sh @@ -71,6 +71,9 @@ if [[ "${JAVA_TOOLS_ZIP}" != "released" ]]; then fi JAVA_TOOLS_ZIP_FILE_URL=${JAVA_TOOLS_ZIP_FILE_URL:-} +unzip $(rlocation io_bazel/$JAVA_TOOLS_ZIP) WORKSPACE -d java_tools_dir +cat java_tools_dir/WORKSPACE + if [[ $# -gt 0 ]]; then JAVABASE_VALUE="$1"; shift add_to_bazelrc "build --javabase=${JAVABASE_VALUE}" diff --git a/src/test/shell/bazel/bazel_java_tools_test.sh b/src/test/shell/bazel/bazel_java_tools_test.sh index 77facba21a08fb..a5137bb741e939 100755 --- a/src/test/shell/bazel/bazel_java_tools_test.sh +++ b/src/test/shell/bazel/bazel_java_tools_test.sh @@ -173,4 +173,26 @@ function test_java_tools_has_proguard() { expect_path_in_java_tools "java_tools/third_party/java/proguard/GPL.html" } +function test_java_tools_toolchain_builds() { + local java_tools_rlocation=$(rlocation io_bazel/src/java_tools_${JAVA_TOOLS_JAVA_VERSION}.zip) + local java_tools_zip_file_url="file://${java_tools_rlocation}" + if "$is_windows"; then + java_tools_zip_file_url="file:///${java_tools_rlocation}" + fi + cat >WORKSPACE < Date: Mon, 1 Jul 2019 12:45:22 +0200 Subject: [PATCH 3/8] Remove debug statements. --- src/test/shell/bazel/bazel_java_test.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/test/shell/bazel/bazel_java_test.sh b/src/test/shell/bazel/bazel_java_test.sh index a411c7fbc36628..a867f19ccffbce 100755 --- a/src/test/shell/bazel/bazel_java_test.sh +++ b/src/test/shell/bazel/bazel_java_test.sh @@ -71,9 +71,6 @@ if [[ "${JAVA_TOOLS_ZIP}" != "released" ]]; then fi JAVA_TOOLS_ZIP_FILE_URL=${JAVA_TOOLS_ZIP_FILE_URL:-} -unzip $(rlocation io_bazel/$JAVA_TOOLS_ZIP) WORKSPACE -d java_tools_dir -cat java_tools_dir/WORKSPACE - if [[ $# -gt 0 ]]; then JAVABASE_VALUE="$1"; shift add_to_bazelrc "build --javabase=${JAVABASE_VALUE}" From d2c253e006b6b52adb64cc6ecc07ac65cf247003 Mon Sep 17 00:00:00 2001 From: iirina Date: Wed, 3 Jul 2019 09:55:56 +0200 Subject: [PATCH 4/8] Add rules_java to the workspace suffix. --- WORKSPACE | 16 ++++++++++++++++ .../build/lib/bazel/rules/java/jdk.WORKSPACE | 7 +++++++ src/test/shell/bazel/testdata/jdk_http_archives | 2 +- tools/jdk/WORKSPACE.java_tools | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 2d610b9e2071c7..13ae05e4370d2f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -119,6 +119,8 @@ distdir_tar( "android_tools_pkg-0.7.tar.gz", # bazelbuild/platforms "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", + # bazelbuild/rules_java + "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", ], dirname = "derived/distdir", sha256 = { @@ -134,6 +136,8 @@ distdir_tar( "android_tools_pkg-0.7.tar.gz": "a8e48f2fdee2c34b31f45bd47ce050a75ac774f19e0a1f6694fa49fc11d88718", # built at 6bb5ae2a8353d75867ac9136d374df7916450449 # bazelbuild/platforms "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", + # bazelbuild/rules_java + "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", }, urls = { "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": [ @@ -176,6 +180,10 @@ distdir_tar( "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", ], + # bazelbuild/rules_java + "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": [ + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + ] }, ) @@ -418,6 +426,8 @@ distdir_tar( "android_tools_pkg-0.7.tar.gz", # bazelbuild/platforms "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", + # bazelbuild/rules_java + "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", ], dirname = "test_WORKSPACE/distdir", sha256 = { @@ -443,6 +453,8 @@ distdir_tar( "android_tools_pkg-0.7.tar.gz": "a8e48f2fdee2c34b31f45bd47ce050a75ac774f19e0a1f6694fa49fc11d88718", # built at 6bb5ae2a8353d75867ac9136d374df7916450449 # bazelbuild/platforms "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", + # bazelbuild/rules_java + "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", }, urls = { "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz"], @@ -472,6 +484,10 @@ distdir_tar( "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", ], + # bazelbuild/rules_java + "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": [ + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] }, ) 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 ae149342ed92de..a9358ed6006354 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 @@ -238,4 +238,11 @@ http_archive( ], ) +http_archive( + name = "rules_java", + sha256 = "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + urls = ["https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"], + strip_prefix = "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178" +) + register_toolchains("@bazel_tools//tools/jdk:all") diff --git a/src/test/shell/bazel/testdata/jdk_http_archives b/src/test/shell/bazel/testdata/jdk_http_archives index 4acad9876810a1..1c65c20b29cbb9 100644 --- a/src/test/shell/bazel/testdata/jdk_http_archives +++ b/src/test/shell/bazel/testdata/jdk_http_archives @@ -200,4 +200,4 @@ http_archive( sha256 = "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", urls = ["https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"], strip_prefix = "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178" -) \ No newline at end of file +) diff --git a/tools/jdk/WORKSPACE.java_tools b/tools/jdk/WORKSPACE.java_tools index 46e1777f98de7b..099cc1c99570be 100644 --- a/tools/jdk/WORKSPACE.java_tools +++ b/tools/jdk/WORKSPACE.java_tools @@ -5,4 +5,4 @@ http_archive( sha256 = "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", urls = ["https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"], strip_prefix = "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178" -) \ No newline at end of file +) From 81e9b5c90a52c3579c0beccb0d559bc74d65e0bb Mon Sep 17 00:00:00 2001 From: iirina Date: Wed, 3 Jul 2019 09:58:15 +0200 Subject: [PATCH 5/8] Remove unnecessary rules_java repo from test. --- src/test/shell/bazel/bazel_java_tools_test.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/test/shell/bazel/bazel_java_tools_test.sh b/src/test/shell/bazel/bazel_java_tools_test.sh index a5137bb741e939..75584d4fc90b61 100755 --- a/src/test/shell/bazel/bazel_java_tools_test.sh +++ b/src/test/shell/bazel/bazel_java_tools_test.sh @@ -185,12 +185,6 @@ http_archive( name = "local_java_tools", urls = ["${java_tools_zip_file_url}"] ) -http_archive( - name = "rules_java", - sha256 = "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - urls = ["https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"], - strip_prefix = "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178" -) EOF bazel build @local_java_tools//:toolchain || fail "toolchain failed to build" } From 89d459d1a56fa618b45a4f6d96c5d6796b419688 Mon Sep 17 00:00:00 2001 From: iirina Date: Wed, 3 Jul 2019 10:39:19 +0200 Subject: [PATCH 6/8] Add bazel_rules_java_test. --- .../build/lib/bazel/rules/java/jdk.WORKSPACE | 6 +- src/test/shell/bazel/BUILD | 9 ++ src/test/shell/bazel/bazel_rules_java_test.sh | 87 +++++++++++++++++++ 3 files changed, 100 insertions(+), 2 deletions(-) create mode 100755 src/test/shell/bazel/bazel_rules_java_test.sh 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 a9358ed6006354..195bd4fb553eec 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 @@ -1,5 +1,6 @@ # External dependencies for the java_* rules. load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file") +load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") new_local_repository( name = "local_jdk", @@ -238,8 +239,9 @@ http_archive( ], ) -http_archive( - name = "rules_java", +maybe( + http_archive, + "rules_java", sha256 = "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", urls = ["https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"], strip_prefix = "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178" diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index e085eeec4daaeb..559c742e3b86f3 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -364,6 +364,15 @@ sh_test( shard_count = 3, ) +sh_test( + name = "bazel_rules_java_test", + srcs = ["bazel_rules_java_test.sh"], + data = [ + ":test-deps", + "@bazel_tools//tools/bash/runfiles", + ], +) + sh_test( name = "bazel_test_test", timeout = "long", diff --git a/src/test/shell/bazel/bazel_rules_java_test.sh b/src/test/shell/bazel/bazel_rules_java_test.sh new file mode 100755 index 00000000000000..3d73e985f8543a --- /dev/null +++ b/src/test/shell/bazel/bazel_rules_java_test.sh @@ -0,0 +1,87 @@ +#!/bin/bash +# +# Copyright 2019 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Tests the examples provided in Bazel +# + +# --- begin runfiles.bash initialization --- +if [[ ! -d "${RUNFILES_DIR:-/dev/null}" && ! -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then + if [[ -f "$0.runfiles_manifest" ]]; then + export RUNFILES_MANIFEST_FILE="$0.runfiles_manifest" + elif [[ -f "$0.runfiles/MANIFEST" ]]; then + export RUNFILES_MANIFEST_FILE="$0.runfiles/MANIFEST" + elif [[ -f "$0.runfiles/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then + export RUNFILES_DIR="$0.runfiles" + fi +fi +if [[ -f "${RUNFILES_DIR:-/dev/null}/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then + source "${RUNFILES_DIR}/bazel_tools/tools/bash/runfiles/runfiles.bash" +elif [[ -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then + source "$(grep -m1 "^bazel_tools/tools/bash/runfiles/runfiles.bash " \ + "$RUNFILES_MANIFEST_FILE" | cut -d ' ' -f 2-)" +else + echo >&2 "ERROR: cannot find @bazel_tools//tools/bash/runfiles:runfiles.bash" + exit 1 +fi +# --- end runfiles.bash initialization --- + +source "$(rlocation "io_bazel/src/test/shell/integration_test_setup.sh")" \ + || { echo "integration_test_setup.sh not found!" >&2; exit 1; } + +case "$(uname -s | tr [:upper:] [:lower:])" in +msys*|mingw*|cygwin*) + declare -r is_windows=true + ;; +*) + declare -r is_windows=false + ;; +esac + +if "$is_windows"; then + export MSYS_NO_PATHCONV=1 + export MSYS2_ARG_CONV_EXCL="*" +fi + +function test_rules_java_can_be_overridden() { + # We test that a custom repository can override @platforms in their + # WORKSPACE file. + mkdir -p rules_java_can_be_overridden || fail "couldn't create directory" + touch rules_java_can_be_overridden/BUILD || \ fail "couldn't touch BUILD file" + cat > rules_java_can_be_overridden/WORKSPACE < override/BUILD < $TEST_log || \ + fail "Bazel failed to build @rules_java" +} + +function test_rules_java_repository_builds_itself() { + # We test that a built-in @rules_java repository is buildable. + bazel build @rules_java//... &> $TEST_log \ + || fail "Build failed unexpectedly" +} + +run_suite "rules_java tests" From e7b7efc91e0fd3e3f4a36bc1928c2ca834c523dc Mon Sep 17 00:00:00 2001 From: iirina Date: Wed, 3 Jul 2019 10:42:17 +0200 Subject: [PATCH 7/8] Revert changes to src/test/shell/bazel/testdata/jdk_http_archives --- src/test/shell/bazel/testdata/jdk_http_archives | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/test/shell/bazel/testdata/jdk_http_archives b/src/test/shell/bazel/testdata/jdk_http_archives index 1c65c20b29cbb9..3cd205af14afa4 100644 --- a/src/test/shell/bazel/testdata/jdk_http_archives +++ b/src/test/shell/bazel/testdata/jdk_http_archives @@ -194,10 +194,3 @@ http_archive( "https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-win_x64.zip", ], ) - -http_archive( - name = "rules_java", - sha256 = "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - urls = ["https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"], - strip_prefix = "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178" -) From 8aa8a09c1f74fe08c961be3ba4f5f001b469bb27 Mon Sep 17 00:00:00 2001 From: iirina Date: Wed, 3 Jul 2019 10:46:13 +0200 Subject: [PATCH 8/8] Revert changes touching WORKSPACE.java_tools --- src/BUILD | 8 -------- tools/jdk/BUILD | 3 +-- tools/jdk/WORKSPACE.java_tools | 8 -------- 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 tools/jdk/WORKSPACE.java_tools diff --git a/src/BUILD b/src/BUILD index 07bfddd550c948..c002a45d66924b 100644 --- a/src/BUILD +++ b/src/BUILD @@ -650,13 +650,6 @@ JAVA_VERSIONS = ("9", "10", "11", "12") for java_version in JAVA_VERSIONS ] -genrule( - name = "create_java_tools_workspace_file_zip", - srcs = ["//tools/jdk:WORKSPACE.java_tools"], - outs = ["java_tools_workspace.zip"], - cmd = "cp $< WORKSPACE && zip -jX $@ WORKSPACE", -) - [ genrule( name = "java_tools_java" + java_version + "_build_zip", @@ -694,7 +687,6 @@ genrule( srcs = [ "java_tools_java" + java_version + "_no_build.zip", "java_tools_java_" + java_version + "_build.zip", - ":java_tools_workspace.zip" ], outs = ["java_tools_java" + java_version + ".zip"], cmd = "$(location //src:merge_zip_files) - $@ $(SRCS)", diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index b0a0e40e87fa04..ad758b68006e5a 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -152,7 +152,7 @@ remote_java_tools_filegroup( target = ":singlejar", ) -exports_files(["BUILD.java_tools", "WORKSPACE.java_tools"]) +exports_files(["BUILD.java_tools"]) remote_java_tools_filegroup( name = "genclass", @@ -403,7 +403,6 @@ filegroup( "proguard_whitelister_test_input.cfg", "remote_java_tools_aliases.bzl", "toolchain_utils.bzl", - "WORKSPACE.java_tools" ], ) diff --git a/tools/jdk/WORKSPACE.java_tools b/tools/jdk/WORKSPACE.java_tools deleted file mode 100644 index 099cc1c99570be..00000000000000 --- a/tools/jdk/WORKSPACE.java_tools +++ /dev/null @@ -1,8 +0,0 @@ -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - -http_archive( - name = "rules_java", - sha256 = "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - urls = ["https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"], - strip_prefix = "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178" -)