Project import generated by Copybara.

PiperOrigin-RevId: 254856010
This commit is contained in:
MediaPipe Team
2019-06-24 16:19:49 -07:00
committed by jqtang
parent fcb23fd99d
commit 2aaf4693db
21 changed files with 275 additions and 43 deletions
+4 -4
View File
@@ -33,7 +33,7 @@ def _canonicalize_proto_path_oss(all_protos, genfile_path):
"""
proto_paths = []
proto_file_names = []
for s in all_protos:
for s in all_protos.to_list():
if s.path.startswith(genfile_path):
repo_name, _, file_name = s.path[len(genfile_path + "/external/"):].partition("/")
proto_paths.append(genfile_path + "/external/" + repo_name)
@@ -60,7 +60,7 @@ def _encode_binary_proto_impl(ctx):
# order of gendir before ., is needed for the proto compiler to resolve
# import statements that reference proto files produced by a genrule.
ctx.actions.run_shell(
inputs = list(all_protos) + [textpb, ctx.executable._proto_compiler],
tools = all_protos.to_list() + [textpb, ctx.executable._proto_compiler],
outputs = [binarypb],
command = " ".join(
[
@@ -110,7 +110,7 @@ def _generate_proto_descriptor_set_impl(ctx):
# order of gendir before ., is needed for the proto compiler to resolve
# import statements that reference proto files produced by a genrule.
ctx.actions.run(
inputs = list(all_protos) + [ctx.executable._proto_compiler],
inputs = all_protos.to_list() + [ctx.executable._proto_compiler],
outputs = [descriptor],
executable = ctx.executable._proto_compiler,
arguments = [
@@ -119,7 +119,7 @@ def _generate_proto_descriptor_set_impl(ctx):
"--proto_path=" + ctx.genfiles_dir.path,
"--proto_path=.",
] +
[s.path for s in all_protos],
[s.path for s in all_protos.to_list()],
mnemonic = "GenerateProtoDescriptor",
)
-3
View File
@@ -24,7 +24,6 @@ load("//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library"
proto_library(
name = "sky_light_calculator_proto",
srcs = ["sky_light_calculator.proto"],
visibility = ["//mediapipe:__subpackages__"],
deps = ["//mediapipe/framework:calculator_proto"],
)
@@ -39,7 +38,6 @@ mediapipe_cc_proto_library(
proto_library(
name = "night_light_calculator_proto",
srcs = ["night_light_calculator.proto"],
visibility = ["//mediapipe:__subpackages__"],
deps = ["//mediapipe/framework:calculator_proto"],
)
@@ -54,7 +52,6 @@ mediapipe_cc_proto_library(
proto_library(
name = "zoo_mutator_proto",
srcs = ["zoo_mutator.proto"],
visibility = ["//mediapipe:__subpackages__"],
deps = ["@protobuf_archive//:any_proto"],
)
+1 -1
View File
@@ -94,7 +94,7 @@ def _transitive_protos_aspect_impl(target, ctx):
proto_libs = []
if ctx.rule.kind == "proto_library":
proto_libs = [f for f in target.files if f.extension == "a"]
proto_libs = [f for f in target.files.to_list() if f.extension == "a"]
# Searching through the hdrs attribute is necessary because of
# portable_proto_library. In portable mode, that macro