diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/repository')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/repository/Bind.java | 3 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/repository/WorkspaceConfiguredTargetFactory.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/Bind.java b/src/main/java/com/google/devtools/build/lib/rules/repository/Bind.java index 4f9edc3487..2a6b4d14d5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/Bind.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/Bind.java @@ -16,6 +16,7 @@ package com.google.devtools.build.lib.rules.repository; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException; import com.google.devtools.build.lib.analysis.AliasProvider; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory; @@ -37,7 +38,7 @@ public class Bind implements RuleConfiguredTargetFactory { @Override public ConfiguredTarget create(RuleContext ruleContext) - throws InterruptedException, RuleErrorException { + throws InterruptedException, RuleErrorException, ActionConflictException { if (ruleContext.getPrerequisite("actual", Mode.TARGET) == null) { ruleContext.ruleError(String.format("The external label '%s' is not bound to anything", ruleContext.getLabel())); diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/WorkspaceConfiguredTargetFactory.java b/src/main/java/com/google/devtools/build/lib/rules/repository/WorkspaceConfiguredTargetFactory.java index 8a51c46323..802b499076 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/WorkspaceConfiguredTargetFactory.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/WorkspaceConfiguredTargetFactory.java @@ -14,12 +14,12 @@ package com.google.devtools.build.lib.rules.repository; +import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.RunfilesProvider; -import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; /** * Implementation of workspace rules. Generally, these don't have any providers, since they @@ -30,7 +30,7 @@ public class WorkspaceConfiguredTargetFactory implements RuleConfiguredTargetFac @Override public ConfiguredTarget create(RuleContext ruleContext) - throws InterruptedException, RuleErrorException { + throws InterruptedException, RuleErrorException, ActionConflictException { return new RuleConfiguredTargetBuilder(ruleContext) .addProvider(RunfilesProvider.class, RunfilesProvider.EMPTY) .build(); |