2 files changed, 15 insertions, 1 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 180d687f87..0fbb053d65 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
@@ -248,6 +248,10 @@ public class FdoSupport {
     return fdoRoot;
   }
 
+  public Path getFdoProfile() {
+    return fdoProfile;
+  }
+
   /** Creates an initialized {@link FdoSupport} instance. */
   static FdoSupport create(
       SkyFunction.Environment env,
@@ -304,7 +308,7 @@ public class FdoSupport {
       return new FdoSupport(
           fdoMode, LipoMode.OFF, fdoRoot, fdoRootExecPath, fdoInstrument, fdoProfile, null);
     }
-    
+
     FdoZipContents fdoZipContents = extractFdoZip(
         fdoMode, lipoMode, execRoot, fdoProfile, fdoRootExecPath,
         PrecomputedValue.PRODUCT_NAME.get(env));
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
index 7ed003bcc2..035199da4d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
@@ -59,6 +59,7 @@ public class ProtoCompileActionBuilder {
   private String language;
   private String langPrefix;
   private Iterable<Artifact> outputs;
+  private Iterable<Artifact> inputs;
   private String langParameter;
   private String langPluginName;
   private String langPluginParameter;
@@ -103,6 +104,11 @@ public class ProtoCompileActionBuilder {
     return this;
   }
 
+  public ProtoCompileActionBuilder setInputs(Iterable<Artifact> inputs) {
+    this.inputs = inputs;
+    return this;
+  }
+
   public ProtoCompileActionBuilder setLangParameter(String langParameter) {
     this.langParameter = langParameter;
     return this;
@@ -223,6 +229,10 @@ public class ProtoCompileActionBuilder {
       result.addTool(langPluginTarget);
     }
 
+    if (inputs != null) {
+      result.addInputs(inputs);
+    }
+
     FilesToRunProvider compilerTarget =
         ruleContext.getExecutablePrerequisite(":proto_compiler", RuleConfiguredTarget.Mode.HOST);
     if (compilerTarget == null) {