aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar elenairina <elenairina@google.com>2018-02-19 06:49:18 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-02-19 06:51:10 -0800
commit9c1feebff51adb7ff744458057a5358830a50d89 (patch)
treefea725fd40b0546ba845845e915f58f4666131e5
parent7fe59b98eefc96a6310f0b0221d4e0f18e2a9000 (diff)
Pass short proto path before the long path to protoc.
Progress on #4544. RELNOTES: None. PiperOrigin-RevId: 186217057
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java4
1 files changed, 2 insertions, 2 deletions
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 a78fcd3e3f..374bf9b9fe 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
@@ -530,6 +530,8 @@ public class ProtoCompileActionBuilder {
ImmutableList<String> protocOpts) {
CustomCommandLine.Builder cmdLine = CustomCommandLine.builder();
+ cmdLine.addAll(transitiveProtoPathFlags);
+
// A set to check if there are multiple invocations with the same name.
HashSet<String> invocationNames = new HashSet<>();
@@ -577,8 +579,6 @@ public class ProtoCompileActionBuilder {
cmdLine.add("--disallow_services");
}
- cmdLine.addAll(transitiveProtoPathFlags);
-
return cmdLine.build();
}