commit d579b6eafd1d41a73c0dfce7b9ffcfdf1d607a97
author lberki <lberki@google.com> Mon Jul 10 14:28:56 2017 +0200
committer László Csomor <laszlocsomor@google.com> Mon Jul 10 14:37:49 2017 +0200
tree 05416632d6f9d9ede24355087a15b591d1d15929
parent 30fd4566557f016e8c2fa1629196bbd724cde576

Make jvm_runtime.java_home expand Make variables.

RELNOTES: None.
PiperOrigin-RevId: 161383469

src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index b3d8940..d2999d3 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -1108,11 +1108,12 @@
   }
 
   /**
-   * Return a context that maps Make variable names (string) to values (string).
+   * Expands the make variables in {@code expression}.
    *
-   * <p>Uses {@NoopExpansionInterceptor}.
-   *
-   * @return a ConfigurationMakeVariableContext.
+   * @param attributeName the name of the attribute from which "expression" comes; used for error
+   *     reporting.
+   * @param expression the string to expand.
+   * @return the expanded string.
    */
   public String expandMakeVariables(String attributeName, String expression) {
     return expandMakeVariables(attributeName, expression, ImmutableList.<MakeVariableSupplier>of());