commit b4ad154f86445a512b282b2f889729f815906a83
author Vladimir Moskva <vladmos@google.com> Thu Sep 29 13:05:48 2016 +0000
committer Yun Peng <pcloudy@google.com> Fri Sep 30 08:11:31 2016 +0000
tree 7be835ddd855861ec378c35d91fa1e3801a66463
parent 7de1f246b8cfe33bc848efce6eb5c8b41d937c91

Fixed location expansion in cc rules.

--
MOS_MIGRATED_REVID=134652924

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 f160424..49f1c92 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
@@ -38,6 +38,7 @@
 import com.google.devtools.build.lib.actions.ArtifactOwner;
 import com.google.devtools.build.lib.actions.Root;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.PrerequisiteValidator;
+import com.google.devtools.build.lib.analysis.LocationExpander.Options;
 import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode;
 import com.google.devtools.build.lib.analysis.actions.ActionConstructionContext;
 import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory.BuildInfoKey;
@@ -939,7 +940,9 @@
    * <p>This methods should be called only during initialization.
    */
   public void tokenizeAndExpandMakeVars(List<String> tokens, String attributeName, String value) {
-    tokenizeAndExpandMakeVars(tokens, attributeName, value, null);
+    LocationExpander locationExpander =
+        new LocationExpander(this, Options.ALLOW_DATA, Options.EXEC_PATHS);
+    tokenizeAndExpandMakeVars(tokens, attributeName, value, locationExpander);
   }
 
   /**