Improve the JDK and JRE filegroups to include all the necessary parts. Then fix the Skylark rules and tests that so far failed to declare dependencies on the JVM.

--
MOS_MIGRATED_REVID=101215495

1 files changed, 44 insertions, 1 deletions

diff --git a/src/main/tools/jdk.BUILD b/src/main/tools/jdk.BUILD
index 871fd9e32a..f67ac2f838 100644
--- a/src/main/tools/jdk.BUILD
+++ b/src/main/tools/jdk.BUILD
@@ -49,8 +49,51 @@ filegroup(
 )
 
 filegroup(
+    name = "jre-bin",
+    srcs = glob(["jre/bin/**"]),
+)
+
+filegroup(
+    name = "jre-lib",
+    srcs = glob(["jre/lib/**"]),
+)
+
+filegroup(
+    name = "jre-default",
+    srcs = [
+        ":jre-bin",
+        ":jre-lib",
+    ],
+)
+
+filegroup(
+    name = "jdk-bin",
+    srcs = glob(["bin/**"]),
+)
+
+filegroup(
+    name = "jdk-include",
+    srcs = glob(["include/**"]),
+)
+
+filegroup(
+    name = "jdk-lib",
+    srcs = glob(
+        ["lib/**"],
+        exclude= [
+            "lib/missioncontrol/**",
+            "lib/visualvm/**",
+        ]),
+)
+
+filegroup(
     name = "jdk-default",
-    srcs = glob(["bin/*"]),
+    srcs = [
+        ":jdk-bin",
+        ":jdk-include",
+        ":jdk-lib",
+        ":jre-default",
+    ],
 )
 
 filegroup(