Update GenRule to include the Cpp and Jdk toolchains and properly handle

expanded make variables.

--
PiperOrigin-RevId: 146478427
MOS_MIGRATED_REVID=146478427

1 files changed, 2 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java
index c711787225..e38c3d9cc8 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java
@@ -22,6 +22,7 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.RunfilesSupplier;
+import com.google.devtools.build.lib.analysis.actions.ExecutionRequirements;
 import com.google.devtools.build.lib.analysis.actions.FileWriteAction;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
@@ -296,7 +297,7 @@ public final class CommandHelper {
    */
   private PathFragment shellPath(Map<String, String> executionInfo) {
     // Use vanilla /bin/bash for actions running on mac machines.
-    return executionInfo.containsKey("requires-darwin")
+    return executionInfo.containsKey(ExecutionRequirements.REQUIRES_DARWIN)
         ? new PathFragment("/bin/bash") : ruleContext.getConfiguration().getShellExecutable();
   }
 }