2 files changed, 6 insertions, 1 deletions
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
index c52eabc5f9..f1c9b4f7f7 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java
@@ -94,6 +94,10 @@ public final class Runfiles {
         }
       };
 
+  boolean getLegacyExternalRunfiles() {
+    return legacyRepositoryStructure;
+  }
+
   /**
    * An entry in the runfiles map.
    *
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java b/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java
index 513fdc4e21..0c45b89d25 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java
@@ -192,6 +192,7 @@ public final class SourceManifestAction extends AbstractFileWriteAction {
   protected String computeKey() {
     Fingerprint f = new Fingerprint();
     f.addString(GUID);
+    f.addBoolean(runfiles.getLegacyExternalRunfiles());
     Map<PathFragment, Artifact> symlinks = runfiles.getSymlinksAsMap();
     f.addInt(symlinks.size());
     for (Map.Entry<PathFragment, Artifact> symlink : symlinks.entrySet()) {
@@ -219,7 +220,7 @@ public final class SourceManifestAction extends AbstractFileWriteAction {
   /**
    * Supported manifest writing strategies.
    */
-  public static enum ManifestType implements ManifestWriter {
+  public enum ManifestType implements ManifestWriter {
 
     /**
      * Writes each line as: