aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2017-07-26 03:53:53 +0200
committerGravatar Jakob Buchgraber <buchgr@google.com>2017-07-26 10:35:06 +0200
commit7a38e2702f70003a9bbc6ef21e70ace74aebdad0 (patch)
tree222b5ed703784f6c90a0eba95bb02af27f335943 /src/main/java/com/google/devtools/build/lib
parent9a3028ce684f1d71d887095b23dd922d55ecfbf9 (diff)
Pass "profile_path" flag to protoc if necessary.
This change adds a way to set proto profile artifact to ProtoCompileActionBuilder so that it passes profile_path flag to protocol_compiler. RELNOTES: None. PiperOrigin-RevId: 163155532
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/FdoSupport.java6
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java10
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) {