Change the name of the runfiles constant

-- MOS_MIGRATED_REVID=87621601
ibmsoe · Mar 5, 2015 · e677a91 · e677a91
1 parent 7c5eefb
commit e677a91
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/Constants.java b/src/main/java/com/google/devtools/build/lib/Constants.java
@@ -31,7 +31,7 @@ private Constants() {
   public static final String MAIN_RULE_CLASS_PROVIDER =
       "com.google.devtools.build.lib.bazel.rules.BazelRuleClassProvider".toString();
   public static final ImmutableList<String> IGNORED_TEST_WARNING_PREFIXES = ImmutableList.of();
-  public static final String RUNFILES_PREFIX = "".toString();
+  public static final String DEFAULT_RUNFILES_PREFIX = "".toString();
 
   public static final ImmutableList<String> WATCHFS_BLACKLIST = ImmutableList.of();
 

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java
@@ -176,7 +176,7 @@ private Runfiles(String suffix,
       NestedSet<Map.Entry<PathFragment, Artifact>> rootSymlinks,
       NestedSet<PruningManifest> pruningManifests,
       Function<Map<PathFragment, Artifact>, Map<PathFragment, Artifact>> expander) {
-    this.suffix = suffix == null ? Constants.RUNFILES_PREFIX : suffix;
+    this.suffix = suffix == null ? Constants.DEFAULT_RUNFILES_PREFIX : suffix;
     this.unconditionalArtifacts = Preconditions.checkNotNull(artifacts);
     this.symlinks = Preconditions.checkNotNull(symlinks);
     this.rootSymlinks = Preconditions.checkNotNull(rootSymlinks);

diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -106,7 +106,7 @@ protected NameConflictException(String message) {
    * The name of the workspace this package is in. Used as a prefix for the runfiles directory.
    * This can be set in the WORKSPACE file. This must be a valid target name.
    */
-  protected String workspaceName = Constants.RUNFILES_PREFIX;
+  protected String workspaceName = Constants.DEFAULT_RUNFILES_PREFIX;
 
   /**
    * The root of the source tree in which this package was found. It is an invariant that