Move the javabase middleman to within JavaRuntimeInfo.

This is necessary bacause //tools/jdk:current_host_java_runtime is implemented in Skylark, and we don't (and shouldn't) have a way to create MiddlemanProvider from there.

However, we are planning to move to the the java_runtime_alias/java_host_runtime_alias rules as the exclusive representation of the javabase, so we need to be able to make one from Skylark.

Previously, this wasn't a problem, because if the javabase was a filegroup (like //tools/defaults:jdk), the path to the Java binary was taken from the configuration and the middleman from the filegroup, but since we are removing that information from the configuration, we can't do that anymore.

RELNOTES: None.
PiperOrigin-RevId: 178242307

1 files changed, 2 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfoTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfoTest.java
index 8b4184ff51..0d7242453e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfoTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfoTest.java
@@ -31,11 +31,13 @@ public class JavaRuntimeInfoTest {
   public void equalityIsObjectIdentity() {
     JavaRuntimeInfo a = new JavaRuntimeInfo(
         NestedSetBuilder.emptySet(Order.STABLE_ORDER),
+        NestedSetBuilder.emptySet(Order.STABLE_ORDER),
         PathFragment.create(""),
         PathFragment.create(""),
         PathFragment.create(""));
     JavaRuntimeInfo b = new JavaRuntimeInfo(
         NestedSetBuilder.emptySet(Order.STABLE_ORDER),
+        NestedSetBuilder.emptySet(Order.STABLE_ORDER),
         PathFragment.create(""),
         PathFragment.create(""),
         PathFragment.create(""));