commit 8153cb80f4a4424640e694cb6ed4792dcc193171
author Liam Miller-Cushon <cushon@google.com> Fri Feb 17 03:42:18 2017 +0000
committer Dmitry Lomov <dslomov@google.com> Fri Feb 17 14:54:52 2017 +0000
tree 63202ecd0bd7f09ecd0c8017f80d05f9a6431dfb
parent af864688d073c463c9e162fcf9ee94815a788d9b

Rename 'extdir' to 'extclasspath'

The targets contain the entries in the extdir and are used to
construct a classpath, so the label is not actually a directory.

--
PiperOrigin-RevId: 147798672
MOS_MIGRATED_REVID=147798672

src/java_tools/buildjar/BUILD

diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD
index 80d70e9..87f74b23 100644
--- a/src/java_tools/buildjar/BUILD
+++ b/src/java_tools/buildjar/BUILD
@@ -65,7 +65,7 @@
     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 @@
     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"],

src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE

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 3b78cac..7963114 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 @@
     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",
 )

src/main/tools/jdk.BUILD

diff --git a/src/main/tools/jdk.BUILD b/src/main/tools/jdk.BUILD
index 07710d6..87147b5 100644
--- a/src/main/tools/jdk.BUILD
+++ b/src/main/tools/jdk.BUILD
@@ -68,12 +68,18 @@
     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

src/test/shell/bazel/BUILD

diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 08f4401..7694664 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -42,6 +42,7 @@
         "//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",
     ],

tools/jdk/BUILD

diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index b717f9f..0bd8db3 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -77,7 +77,7 @@
 )
 
 alias(
-    name = "extdir",
+    name = "extclasspath",
     actual = "@local_jdk//:extdir",
 )
 
@@ -106,7 +106,7 @@
     name = "toolchain",
     bootclasspath = [":bootclasspath"],
     encoding = "UTF-8",
-    extclasspath = [":extdir"],
+    extclasspath = [":extclasspath"],
     forcibly_disable_header_compilation = 0,
     genclass = ["//tools/jdk:GenClass_deploy.jar"],
     header_compiler = ["//tools/jdk:turbine_deploy.jar"],