Remove all non-essential call sites of methods on Jvm.

This is so that we can eventually route the information it now contains through JavaRuntimeProvider.

RELNOTES: None.
PiperOrigin-RevId: 161196809

1 files changed, 7 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java
index c6e16e1911..cb06a32b1f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java
@@ -155,11 +155,16 @@ public abstract class JavaHelper {
     }
 
     TransitiveInfoCollection jvm = ruleContext.getPrerequisite(":jvm", Mode.TARGET);
-    if (jvm == null) {
+    return jvm == null ? null :  jvm.getProvider(JavaRuntimeProvider.class);
+  }
+
+  public static JavaRuntimeProvider getHostJavaRuntime(RuleContext ruleContext) {
+    if (!ruleContext.attributes().has(":host_jdk", BuildType.LABEL)) {
       return null;
     }
 
-    return jvm.getProvider(JavaRuntimeProvider.class);
+    TransitiveInfoCollection jvm = ruleContext.getPrerequisite(":host_jdk", Mode.HOST);
+    return jvm == null ? null :  jvm.getProvider(JavaRuntimeProvider.class);
   }
 
   /**