From ba41c2df007f4d81e0987ae76824c855e5f4c437 Mon Sep 17 00:00:00 2001 From: Kristina Chodorow Date: Mon, 10 Oct 2016 17:21:24 +0000 Subject: Add bin_dir and genfiles_dir to ctx -- MOS_MIGRATED_REVID=135689610 --- .../devtools/build/lib/analysis/RuleContext.java | 23 +++------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to '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 4b9b72a3a0..ecb2e89dd3 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 @@ -76,7 +76,6 @@ import com.google.devtools.build.lib.packages.TargetUtils; import com.google.devtools.build.lib.rules.AliasProvider; import com.google.devtools.build.lib.rules.fileset.FilesetProvider; import com.google.devtools.build.lib.shell.ShellUtils; -import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.util.FileTypeSet; @@ -522,25 +521,9 @@ public final class RuleContext extends TargetContext * which this target (which must be an OutputFile or a Rule) is associated. */ public Root getBinOrGenfilesDirectory() { - return rule.hasBinaryOutput() ? getBinDirectory() : getGenfilesDirectory(); - } - - /** - * Returns the bin directory for this build configuration. - */ - @SkylarkCallable(name = "bin_dir", structField = true, - doc = "The root corresponding to bin directory.") - public Root getBinDirectory() { - return getConfiguration().getBinDirectory(rule.getRepository()); - } - - /** - * Returns the genfiles directory for this build configuration. - */ - @SkylarkCallable(name = "genfiles_dir", structField = true, - doc = "The root corresponding to genfiles directory.") - public Root getGenfilesDirectory() { - return getConfiguration().getGenfilesDirectory(rule.getRepository()); + return rule.hasBinaryOutput() + ? getConfiguration().getBinDirectory(rule.getRepository()) + : getConfiguration().getGenfilesDirectory(rule.getRepository()); } /** -- cgit v1.2.3