commit b5ecdabfef7438cc12cb1fd5738f11a7a6a36f08
author Kristina Chodorow <kchodorow@google.com> Mon Mar 16 17:55:04 2015 +0000
committer Kristina Chodorow <kchodorow@google.com> Wed Mar 18 13:39:47 2015 +0000
tree 67e9505da4e47a19bb514a96a08e64d6a86e5c84
parent ef03359be57475e434f82ab39de4663ca880c035

Make JDK not need tools/jdk/jdk symlinked

--
MOS_MIGRATED_REVID=88742425

tools/jdk/BUILD

diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index 1577063..67b22c3 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -2,22 +2,22 @@
 
 filegroup(
     name = "jni_header",
-    srcs = ["jdk/include/jni.h"],
+    srcs = ["//external:jni_header"],
 )
 
 filegroup(
     name = "jni_md_header-darwin",
-    srcs = ["jdk/include/darwin/jni_md.h"],
+    srcs = ["//external:jni_md_header-darwin"],
 )
 
 filegroup(
     name = "jni_md_header-linux",
-    srcs = ["jdk/include/linux/jni_md.h"],
+    srcs = ["//external:jni_md_header-linux"],
 )
 
 filegroup(
     name = "java",
-    srcs = ["jdk/bin/java"],
+    srcs = ["//external:java"],
 )
 
 BOOTCLASS_JARS = [
@@ -30,17 +30,17 @@
 
 filegroup(
     name = "bootclasspath",
-    srcs = ["jdk/jre/lib/%s" % jar for jar in BOOTCLASS_JARS],
+    srcs = ["//external:bootclasspath"],
 )
 
 filegroup(
     name = "langtools",
-    srcs = ["jdk/lib/tools.jar"],
+    srcs = ["//external:langtools"],
 )
 
 java_import(
     name = "langtools-neverlink",
-    jars = ["jdk/lib/tools.jar"],
+    jars = ["//external:langtools"],
     neverlink = 1,
 )
 
@@ -48,16 +48,10 @@
 filegroup(name = "jdk-null")
 
 filegroup(
-    name = "jdk-default",
-    srcs = glob(["jdk/bin/*"]),
-    path = "jdk",
-)
-
-filegroup(
     name = "jdk",
     srcs = [
-        ":jdk-default",
         ":jdk-null",
+        "//external:jdk-default",
     ],
 )