Simplify external repository support by removing FileValue from RepositoryValue and not depending it from repository functions.

--
MOS_MIGRATED_REVID=108685867

1 files changed, 2 insertions, 7 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/NewGitRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/NewGitRepositoryFunction.java
index 5431342406..ba659f1ffd 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/NewGitRepositoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/NewGitRepositoryFunction.java
@@ -18,7 +18,6 @@ import com.google.devtools.build.lib.bazel.rules.workspace.NewGitRepositoryRule;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier.RepositoryName;
 import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.rules.repository.RepositoryFunction;
-import com.google.devtools.build.lib.skyframe.FileValue;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.skyframe.SkyFunctionException;
 import com.google.devtools.build.skyframe.SkyFunctionException.Transience;
@@ -46,11 +45,7 @@ public class NewGitRepositoryFunction extends GitRepositoryFunction {
     }
 
     Path outputDirectory = getExternalRepositoryDirectory().getRelative(rule.getName());
-    FileValue directoryValue = createDirectory(outputDirectory, env, rule);
-    if (directoryValue == null) {
-      return null;
-    }
-
+    createDirectory(outputDirectory, rule);
     try {
       HttpDownloadValue value = (HttpDownloadValue) env.getValueOrThrow(
           GitCloneFunction.key(rule, outputDirectory), IOException.class);
@@ -62,6 +57,6 @@ public class NewGitRepositoryFunction extends GitRepositoryFunction {
     }
 
     createWorkspaceFile(outputDirectory, rule);
-    return symlinkBuildFile(rule, getWorkspace(), directoryValue, env);
+    return symlinkBuildFile(rule, getWorkspace(), outputDirectory, env);
   }
 }