commit 05698b89f6ba036033d2149bb78d937a02d3ca96
author Florian Weikert <fwe@google.com> Fri Jul 10 09:06:12 2015 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Fri Jul 10 17:20:17 2015 +0000
tree 4114247a2b856aaed73a0067103b8237f55db642
parent d4d999322107de06bf7b0fe82a08de86c4460756

Skylark: Implemented ctx.expand_location() which expands the location(s) of the target file(s) of labels

--
MOS_MIGRATED_REVID=97949264

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

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 5075aba..382c21a 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
@@ -167,10 +167,12 @@
    * variables.
    */
   @SkylarkCallable(doc = "Experimental.")
-  public String resolveCommandAndExpandLabels(Boolean supportLegacyExpansion,
-      Boolean allowDataInLabel) {
+  public String resolveCommandAndExpandLabels(
+      Boolean supportLegacyExpansion, Boolean allowDataInLabel) {
     String command = ruleContext.attributes().get("cmd", Type.STRING);
-    command = new LocationExpander(ruleContext, labelMap, allowDataInLabel).expand("cmd", command);
+    command =
+        new LocationExpander(ruleContext, labelMap, allowDataInLabel)
+            .expandAttribute("cmd", command);
 
     if (supportLegacyExpansion) {
       command = expandLabels(command, labelMap);