diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java | 12 |
1 files changed, 6 insertions, 6 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 29c804fef8..1f93fbf85e 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 @@ -296,7 +296,7 @@ public class ProtoCompileActionBuilder { Preconditions.checkArgument(langPluginParameter1 != null); // We pass a separate langPluginName as there are plugins that cannot be overridden // and thus we have to deal with "$xx_plugin" and "xx_plugin". - result.addFormat( + result.addFormatted( "--plugin=protoc-gen-%s=%s", langPrefix, langPluginTarget.getExecutable().getExecPath()); result.add(new LazyLangPluginFlag(langPrefix, langPluginParameter1)); } @@ -314,11 +314,11 @@ public class ProtoCompileActionBuilder { if (areDepsStrict) { // Note: the %s in the line below is used by proto-compiler. That is, the string we create // here should have a literal %s in it. - result.addFormat(STRICT_DEPS_FLAG_TEMPLATE, ruleContext.getLabel()); + result.addFormatted(STRICT_DEPS_FLAG_TEMPLATE, ruleContext.getLabel()); } for (Artifact src : supportData.getDirectProtoSources()) { - result.addPath(src.getRootRelativePath()); + result.add(src.getRootRelativePath()); } if (!hasServices) { @@ -580,7 +580,7 @@ public class ProtoCompileActionBuilder { String.format("PLUGIN_%s_out", invocation.name)))); if (toolchain.pluginExecutable() != null) { - cmdLine.addFormat( + cmdLine.addFormatted( "--plugin=protoc-gen-PLUGIN_%s=%s", invocation.name, toolchain.pluginExecutable().getExecutable().getExecPath()); } @@ -592,11 +592,11 @@ public class ProtoCompileActionBuilder { cmdLine.add(new ProtoCommandLineArgv(protosInDirectDeps, transitiveSources)); if (protosInDirectDeps != null) { - cmdLine.addFormat(STRICT_DEPS_FLAG_TEMPLATE, ruleLabel); + cmdLine.addFormatted(STRICT_DEPS_FLAG_TEMPLATE, ruleLabel); } for (Artifact src : protosToCompile) { - cmdLine.addPath(src.getExecPath()); + cmdLine.add(src.getExecPath()); } if (!allowServices) { |