From 80eb881222c3266e2265b29ce270203a60e0d9d7 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Fri, 11 Sep 2020 18:38:42 +0200 Subject: [PATCH] Revert renaming of tools to exec_tools Reverts part of f827c023906e7d30f0e5f2992b111ab34153310a as that causes trouble due to action_env variables not passed through to any dependent build which breaks builds using TF_SYSTEM_LIBS --- tensorflow/tensorflow.bzl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl index 4ccef6c1a4e17b..1d9ad04061516b 100644 --- a/tensorflow/tensorflow.bzl +++ b/tensorflow/tensorflow.bzl @@ -779,7 +779,7 @@ def tf_gen_op_wrapper_cc( out_ops_file + "_internal.cc", ], srcs = srcs, - exec_tools = [":" + tool] + tf_binary_additional_srcs(), + tools = [":" + tool] + tf_binary_additional_srcs(), cmd = ("$(location :" + tool + ") $(location :" + out_ops_file + ".h) " + "$(location :" + out_ops_file + ".cc) " + str(include_internal_ops) + " " + api_def_args_str), @@ -981,7 +981,7 @@ def tf_gen_op_wrapper_py( name = name + "_pygenrule", outs = [out], srcs = api_def_srcs + [hidden_file], - exec_tools = [tool_name] + tf_binary_additional_srcs(), + tools = [tool_name] + tf_binary_additional_srcs(), cmd = ("$(location " + tool_name + ") " + api_def_args_str + " @$(location " + hidden_file + ") > $@"), ) @@ -990,7 +990,7 @@ def tf_gen_op_wrapper_py( name = name + "_pygenrule", outs = [out], srcs = api_def_srcs, - exec_tools = [tool_name] + tf_binary_additional_srcs(), + tools = [tool_name] + tf_binary_additional_srcs(), cmd = ("$(location " + tool_name + ") " + api_def_args_str + " " + op_list_arg + " " + ("1" if op_list_is_whitelist else "0") + " > $@"), @@ -2491,7 +2491,7 @@ def tf_generate_proto_text_sources(name, srcs_relative_dir, srcs, protodeps = [] cmd = "$(location //tensorflow/tools/proto_text:gen_proto_text_functions) " + "$(@D) " + srcs_relative_dir + " $(SRCS)", - exec_tools = [ + tools = [ clean_dep("//tensorflow/tools/proto_text:gen_proto_text_functions"), ], )