diff options
author | 2015-08-28 09:17:14 +0000 | |
---|---|---|
committer | 2015-08-28 09:23:31 +0000 | |
commit | 53c3ce10fb891fedb1c199dc6b90048a84b9fa8a (patch) | |
tree | 259c0205e33403b947c77ba3557afc59198e9cc0 /src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java | |
parent | 2ef4ef41a1f38df3204f02f7f8742fa39daeccce (diff) |
Fix $(location //external:some_tool) expansion for genrules.
Previously, targets in "tools" of genrules could only be expanded in
$(location)s as the target of the bind.
This is another part of fully fixing #90.
--
Change-Id: I91444fbfe551b651c46811014639f08f779c70aa
Reviewed-on: https://bazel-review.googlesource.com/#/c/1750/
MOS_MIGRATED_REVID=101760690
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java index 0856345807..d3df3b4f2b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java +++ b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionSpec.java @@ -20,8 +20,8 @@ import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.actions.Action; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.CommandHelper; -import com.google.devtools.build.lib.analysis.FilesToRunProvider; import com.google.devtools.build.lib.analysis.RuleContext; +import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.analysis.actions.CommandLine; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; @@ -118,9 +118,11 @@ public final class ExtraActionSpec implements TransitiveInfoProvider { Map<String, String> env = owningRule.getConfiguration().getDefaultShellEnvironment(); - CommandHelper commandHelper = new CommandHelper(owningRule, - ImmutableList.<FilesToRunProvider>of(), - ImmutableMap.<Label, Iterable<Artifact>>of()); + CommandHelper commandHelper = + new CommandHelper( + owningRule, + ImmutableList.<TransitiveInfoCollection>of(), + ImmutableMap.<Label, Iterable<Artifact>>of()); // Multiple actions in the same configured target need to have different names for the artifact // that might be created here, so we append something that should be unique for each action. |