Inject BlazeDirectories into FdoSupportFunction 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.

The goal is getting rid of the precomputed value entirely, but since this change necessitated a fair number of testing changes, I'm mailing this out as a first step.

PiperOrigin-RevId: 169705474

1 files changed, 3 insertions, 1 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java b/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java
index 981403aaf6..0c924aaec3 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.packages.util;
 
+import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.skyframe.packages.PackageFactoryBuilderWithSkyframeForTesting;
 import com.google.devtools.build.lib.testutil.TestConstants;
@@ -29,7 +30,8 @@ public class LoadingMock {
     return TestConstants.PRODUCT_NAME;
   }
 
-  public PackageFactoryBuilderWithSkyframeForTesting getPackageFactoryBuilderForTesting() {
+  public PackageFactoryBuilderWithSkyframeForTesting getPackageFactoryBuilderForTesting(
+      BlazeDirectories directories) {
     return (PackageFactoryBuilderWithSkyframeForTesting)
         TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING.builder();
   }