From eb9851616b8369361ca46d7eadf4b8058b8935a8 Mon Sep 17 00:00:00 2001
From: Vladimir Moskva <vladmos@google.com>
Date: Thu, 21 Feb 2019 12:58:25 +0100
Subject: [PATCH] Add more fixes

---
 third_party/common.bzl              | 5 ++---
 third_party/systemlibs/protobuf.bzl | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/third_party/common.bzl b/third_party/common.bzl
index 8134bf3d256..4f622cd7da1 100644
--- a/third_party/common.bzl
+++ b/third_party/common.bzl
@@ -21,7 +21,7 @@
 #   substitutions: A dictionary mapping strings to their substitutions
 
 def template_rule_impl(ctx):
-    ctx.template_action(
+    ctx.actions.expand_template(
         template = ctx.file.src,
         output = ctx.outputs.out,
         substitutions = ctx.attr.substitutions,
@@ -31,8 +31,7 @@ template_rule = rule(
     attrs = {
         "src": attr.label(
             mandatory = True,
-            allow_files = True,
-            single_file = True,
+            allow_single_file = True,
         ),
         "substitutions": attr.string_dict(mandatory = True),
         "out": attr.output(mandatory = True),
diff --git a/third_party/systemlibs/protobuf.bzl b/third_party/systemlibs/protobuf.bzl
index 2aa75610a93..774514f3fd9 100644
--- a/third_party/systemlibs/protobuf.bzl
+++ b/third_party/systemlibs/protobuf.bzl
@@ -107,7 +107,7 @@ def _proto_gen_impl(ctx):
         inputs += [plugin]
 
     if args:
-        ctx.action(
+        ctx.actions.run(
             inputs = inputs,
             outputs = ctx.outputs.outs,
             arguments = args + import_flags + [s.path for s in srcs],
@@ -132,7 +132,7 @@ proto_gen = rule(
         "protoc": attr.label(
             cfg = "host",
             executable = True,
-            single_file = True,
+            allow_single_file = True,
             mandatory = True,
         ),
         "plugin": attr.label(
-- 
GitLab