Automated rollback of commit 743dc14f9f30b80d6d821612f77186afb025477d.
*** Reason for rollback ***
Rollforward with a fix
*** Original change description ***
Automated rollback of commit 0ee3aa622fc13b8a5072ebddf5cd65823413b4ff.
*** Reason for rollback ***
Likely causing artifact conflicts for middleman artifacts in some cases due to accidental change of getMiddlemanDir() to getBinDir() in RunfilesSupport.createManifestMiddleman.
*** Original change description ***
Cleanup ActionConstructionContext.
Do not expose the underlying Rule.
RELNOTES: None.
PiperOrigin-RevId: 169241011
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 45febbe..24debaf 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
@@ -50,6 +50,7 @@
import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget.Mode;
import com.google.devtools.build.lib.analysis.fileset.FilesetProvider;
import com.google.devtools.build.lib.cmdline.Label;
+import com.google.devtools.build.lib.cmdline.RepositoryName;
import com.google.devtools.build.lib.collect.ImmutableSortedKeyListMultimap;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
@@ -239,7 +240,20 @@
}
}
+ public RepositoryName getRepository() {
+ return rule.getRepository();
+ }
+
@Override
+ public Root getBinDirectory() {
+ return getConfiguration().getBinDirectory(rule.getRepository());
+ }
+
+ @Override
+ public Root getMiddlemanDirectory() {
+ return getConfiguration().getMiddlemanDirectory(rule.getRepository());
+ }
+
public Rule getRule() {
return rule;
}
