diff options
author | 2017-09-22 15:38:50 -0400 | |
---|---|---|
committer | 2017-09-25 09:38:35 -0400 | |
commit | eea486c686682a77157f156ce844d0bbeadbe77e (patch) | |
tree | 872d366076f3e2177860682eb6eb36c79992ee82 /src/main/java/com/google/devtools/build/lib/rules/cpp | |
parent | a9573d8f751f73a0ff70133a1c440f7b99e245d0 (diff) |
Remove product name precomputed value.
PiperOrigin-RevId: 169723724
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupport.java | 11 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportFunction.java | 3 |
2 files changed, 7 insertions, 7 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); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportFunction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportFunction.java index d8e2490a09..03d3d42e17 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportFunction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupportFunction.java @@ -66,7 +66,8 @@ public class FdoSupportFunction implements SkyFunction { key.getFdoZip(), key.getLipoMode(), key.getLLVMFdo(), - execRoot); + execRoot, + directories.getProductName()); if (env.valuesMissing()) { return null; } |