Don't store workspace name on rule
Instead have callers get it via package.
--
MOS_MIGRATED_REVID=127715494
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 d8288b9..f4aeb47 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
@@ -78,7 +78,6 @@
import com.google.devtools.build.lib.util.Preconditions;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
import com.google.devtools.build.lib.vfs.PathFragment;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -86,7 +85,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import javax.annotation.Nullable;
/**
@@ -156,7 +154,7 @@
private final ErrorReporter reporter;
private final ImmutableBiMap<String, Class<? extends TransitiveInfoProvider>>
skylarkProviderRegistry;
-
+
private ActionOwner actionOwner;
/* lazily computed cache for Make variables, computed from the above. See get... method */
@@ -243,7 +241,7 @@
* Returns the workspace name for the rule.
*/
public String getWorkspaceName() {
- return rule.getWorkspaceName();
+ return rule.getPackage().getWorkspaceName();
}
/**
@@ -254,7 +252,7 @@
}
/**
- * Returns the host configuration for this rule.
+ * Returns the host configuration for this rule.
*/
public BuildConfiguration getHostConfiguration() {
return hostConfiguration;
@@ -282,7 +280,7 @@
getSkylarkProviderRegistry() {
return skylarkProviderRegistry;
}
-
+
/**
* Returns whether this instance is known to have errors at this point during analysis. Do not
* call this method after the initializationHook has returned.
@@ -290,7 +288,7 @@
public boolean hasErrors() {
return getAnalysisEnvironment().hasErrors();
}
-
+
/**
* No-op if {@link #hasErrors} is false, throws {@link RuleErrorException} if it is true.
* This provides a convenience to early-exit of configured target creation if there are errors.
@@ -417,7 +415,7 @@
public void ruleError(String message) {
reporter.ruleError(message);
}
-
+
/**
* Convenience function to report non-attribute-specific errors in the current rule and then
* throw a {@link RuleErrorException}, immediately exiting the build invocation. Alternatively,
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Rule.java b/src/main/java/com/google/devtools/build/lib/packages/Rule.java
index e2cf7bf..cd813c3 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Rule.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Rule.java
@@ -37,7 +37,6 @@
import com.google.devtools.build.lib.syntax.Type;
import com.google.devtools.build.lib.util.BinaryPredicate;
import com.google.devtools.build.lib.util.Preconditions;
-
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.List;
@@ -79,8 +78,6 @@
private final Location location;
- private final String workspaceName;
-
// Initialized in the call to populateOutputFiles.
private List<OutputFile> outputFiles;
private ListMultimap<String, OutputFile> outputFileMap;
@@ -94,7 +91,6 @@
this.attributes = attributeContainer;
this.attributeMap = new RawAttributeMapper(pkg, ruleClass, label, attributes);
this.containsErrors = false;
- this.workspaceName = pkg.getWorkspaceName();
}
void setVisibility(RuleVisibility visibility) {
@@ -117,13 +113,6 @@
this.containsErrors = true;
}
- /**
- * Returns the name of the workspace that this rule is in.
- */
- public String getWorkspaceName() {
- return workspaceName;
- }
-
@Override
public Label getLabel() {
return label;
@@ -325,7 +314,7 @@
* Returns the location of the attribute definition for this rule, if known;
* or the location of the whole rule otherwise. "attrName" need not be a
* valid attribute name for this rule.
- *
+ *
* <p>This method ignores whether the present rule was created by a macro or not.
*/
public Location getAttributeLocationWithoutMacro(String attrName) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
index 3b3060e..0b9ac8c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
@@ -37,7 +37,6 @@
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.packages.BuildType;
-import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory;
import com.google.devtools.build.lib.rules.cpp.CppConfiguration;
import com.google.devtools.build.lib.rules.cpp.CppHelper;
@@ -165,7 +164,8 @@
List<Artifact> nativeLibraries = attributes.getNativeLibraries();
if (!nativeLibraries.isEmpty()) {
jvmFlags.add("-Djava.library.path="
- + JavaCommon.javaLibraryPath(nativeLibraries, ruleContext.getRule().getWorkspaceName()));
+ + JavaCommon.javaLibraryPath(nativeLibraries,
+ ruleContext.getRule().getPackage().getWorkspaceName()));
}
JavaConfiguration javaConfig = ruleContext.getFragment(JavaConfiguration.class);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java
index ae43116..2c33443 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java
@@ -57,7 +57,6 @@
import com.google.devtools.build.lib.util.Preconditions;
import com.google.devtools.build.lib.vfs.PathFragment;
import com.google.protobuf.GeneratedMessage.GeneratedExtension;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -436,7 +435,8 @@
return null;
}
- PathFragment workspaceName = new PathFragment(ruleContext.getRule().getWorkspaceName());
+ PathFragment workspaceName = new PathFragment(
+ ruleContext.getRule().getPackage().getWorkspaceName());
return workspaceName.getRelative(mainArtifact.getRunfilesPath()).getPathString();
}
