1 files changed, 5 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupport.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupport.java
index 0fbb053d65..31cfca5d79 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupport.java
@@ -259,7 +259,8 @@ public class FdoSupport {
       Path fdoProfile,
       LipoMode lipoMode,
       boolean llvmFdo,
-      Path execRoot)
+      Path execRoot,
+      String productName)
       throws IOException, FdoException, InterruptedException {
     FdoMode fdoMode;
     if (fdoProfile != null && isAutoFdo(fdoProfile.getBaseName())) {
@@ -279,8 +280,7 @@ public class FdoSupport {
     Root fdoRoot =
         (fdoProfile == null)
             ? null
-            : Root.asDerivedRoot(execRoot, execRoot.getRelative(
-                PrecomputedValue.PRODUCT_NAME.get(env) + "-fdo"), true);
+            : Root.asDerivedRoot(execRoot, execRoot.getRelative(productName + "-fdo"), true);
 
     PathFragment fdoRootExecPath = fdoProfile == null
         ? null
@@ -309,9 +309,8 @@ public class FdoSupport {
           fdoMode, LipoMode.OFF, fdoRoot, fdoRootExecPath, fdoInstrument, fdoProfile, null);
     }
 
-    FdoZipContents fdoZipContents = extractFdoZip(
-        fdoMode, lipoMode, execRoot, fdoProfile, fdoRootExecPath,
-        PrecomputedValue.PRODUCT_NAME.get(env));
+    FdoZipContents fdoZipContents =
+        extractFdoZip(fdoMode, lipoMode, execRoot, fdoProfile, fdoRootExecPath, productName);
     return new FdoSupport(
         fdoMode, lipoMode, fdoRoot, fdoRootExecPath, fdoInstrument, fdoProfile, fdoZipContents);
   }