Setup FDO command-line options via feature configurations.

--
MOS_MIGRATED_REVID=96835732

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
index 46988c91bb..b6e9f24407 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
@@ -445,7 +445,8 @@ public final class CppLinkAction extends AbstractAction {
    */
   public static class Builder {
     // Builder-only
-    private final RuleContext ruleContext;
+    // Null when invoked from tests (e.g. via createTestBuilder).
+    @Nullable private final RuleContext ruleContext;
     private final AnalysisEnvironment analysisEnvironment;
     private final PathFragment outputPath;
 
@@ -508,7 +509,7 @@ public final class CppLinkAction extends AbstractAction {
      * @param configuration the configuration used to determine the tool chain
      *        and the default link options
      */
-    private Builder(RuleContext ruleContext, PathFragment outputPath,
+    private Builder(@Nullable RuleContext ruleContext, PathFragment outputPath,
         BuildConfiguration configuration, AnalysisEnvironment analysisEnvironment,
         CcToolchainProvider toolchain) {
       this.ruleContext = ruleContext;
@@ -642,7 +643,7 @@ public final class CppLinkAction extends AbstractAction {
               : null;
 
       LinkCommandLine linkCommandLine =
-          new LinkCommandLine.Builder(configuration, getOwner())
+          new LinkCommandLine.Builder(configuration, getOwner(), ruleContext)
               .setOutput(outputLibrary.getArtifact())
               .setInterfaceOutput(interfaceOutput)
               .setSymbolCountsOutput(symbolCountOutput)