commit ca6b46dfe901be10214961189867ad3bcbd0a986
author janakr <janakr@google.com> Fri Sep 22 14:07:15 2017 -0400
committer John Cater <jcater@google.com> Mon Sep 25 09:38:15 2017 -0400
tree 3eb8569e1b9db6168ef68da1b497b122629d68c2
parent b6857d5b5f581656f0cb9934a015f69555eb9c20

Inject BlazeDirectories into RepositoryDelegatorFunction directly, instead of depending on a precomputed value. BlazeDirectories don't change over the lifetime of the Blaze server, and certainly not over the lifetime of a SkyframeExecutor instance, which already had a reference to them.

Step 2.

PiperOrigin-RevId: 169711443

src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
index 0e73735..7a743cd 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
@@ -135,7 +135,8 @@
             LocalRepositoryRule.NAME, (RepositoryFunction) new LocalRepositoryFunction());
     skyFunctions.put(
         SkyFunctions.REPOSITORY_DIRECTORY,
-        new RepositoryDelegatorFunction(repositoryHandlers, null, new AtomicBoolean(true)));
+        new RepositoryDelegatorFunction(
+            repositoryHandlers, null, new AtomicBoolean(true), ImmutableMap::of, directories));
     skyFunctions.put(SkyFunctions.REPOSITORY, new RepositoryLoaderFunction());
 
     differencer = new RecordingDifferencer();