diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/java_tools/buildjar/BUILD | 4 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE | 5 | ||||
| -rw-r--r-- | src/main/tools/jdk.BUILD | 6 | ||||
| -rw-r--r-- | src/test/shell/bazel/BUILD | 1 |
4 files changed, 14 insertions, 2 deletions
diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD index 80d70e957f..87f74b2328 100644 --- a/src/java_tools/buildjar/BUILD +++ b/src/java_tools/buildjar/BUILD @@ -65,7 +65,7 @@ java_toolchain( name = "bootstrap_toolchain", bootclasspath = ["//tools/jdk:bootclasspath"], encoding = "UTF-8", - extclasspath = ["//tools/jdk:extdir"], + extclasspath = ["//tools/jdk:extclasspath"], genclass = ["bootstrap_genclass_deploy.jar"], ijar = ["//third_party/ijar"], javabuilder = ["bootstrap_deploy.jar"], @@ -84,7 +84,7 @@ java_toolchain( name = "bootstrap_toolchain_jdk7", bootclasspath = ["//tools/jdk:bootclasspath"], encoding = "UTF-8", - extclasspath = ["//tools/jdk:extdir"], + extclasspath = ["//tools/jdk:extclasspath"], genclass = ["bootstrap_genclass_deploy.jar"], ijar = ["//third_party/ijar"], javabuilder = [":bootstrap_VanillaJavaBuilder_deploy.jar"], 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 3b78cac998..7963114996 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 @@ -10,11 +10,16 @@ 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", ) diff --git a/src/main/tools/jdk.BUILD b/src/main/tools/jdk.BUILD index 07710d65b6..87147b5ae8 100644 --- a/src/main/tools/jdk.BUILD +++ b/src/main/tools/jdk.BUILD @@ -68,12 +68,18 @@ filegroup( srcs = ["jre/lib/%s" % jar for jar in BOOTCLASS_JARS], ) +# TODO(cushon): migrate to extclasspath and delete filegroup( name = "extdir", srcs = glob(["jre/lib/ext/*.jar"]), ) filegroup( + name = "extclasspath", + srcs = glob(["jre/lib/ext/*.jar"]), +) + +filegroup( name = "jre-bin", srcs = select({ # In some configurations, Java browser plugin is considered harmful and diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index 08f440165f..7694664692 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -42,6 +42,7 @@ filegroup( "//third_party/java/jdk/langtools:test-srcs", "//tools:srcs", "@local_jdk//:bootclasspath", + # TODO(cushon): migrate to extclasspath and delete "@local_jdk//:extdir", "@local_jdk//:jdk", ], |