Upgrade protobuf to v3.6.1
Merge commit 'be9845eb2abf508c86da76321b4e2c352b45b532' into master
Change-Id: I1b3cd2e177686afe95f44abc4fb0c6f9e001e784
diff --git a/y2017/vision/BUILD b/y2017/vision/BUILD
index 142fc22..25e1285 100644
--- a/y2017/vision/BUILD
+++ b/y2017/vision/BUILD
@@ -1,95 +1,95 @@
-load('//aos/build:queues.bzl', 'queue_library')
-load('//tools/build_rules:gtk_dependent.bzl', 'gtk_dependent_cc_binary', 'gtk_dependent_cc_library')
-load('//tools/build_rules:protobuf.bzl', 'proto_cc_library')
+load("//aos/build:queues.bzl", "queue_library")
+load("//tools/build_rules:gtk_dependent.bzl", "gtk_dependent_cc_binary", "gtk_dependent_cc_library")
+load("@com_google_protobuf//:protobuf.bzl", "cc_proto_library")
package(default_visibility = ["//visibility:public"])
queue_library(
- name = 'vision_queue',
- visibility = ['//visibility:public'],
- srcs = [
- 'vision.q',
- ],
+ name = "vision_queue",
+ srcs = [
+ "vision.q",
+ ],
+ visibility = ["//visibility:public"],
)
-proto_cc_library(
- name = 'vision_result',
- src = 'vision_result.proto',
+cc_proto_library(
+ name = "vision_result",
+ srcs = ["vision_result.proto"],
)
-proto_cc_library(
- name = 'vision_config',
- src = 'vision_config.proto',
- deps = [
- '//aos/vision/image:camera_params',
- ],
+cc_proto_library(
+ name = "vision_config",
+ srcs = ["vision_config.proto"],
+ deps = [
+ "//aos/vision/image:camera_params",
+ ],
)
cc_binary(
- name = 'target_sender',
- srcs = [
- 'target_sender.cc',
- ],
- deps = [
- ':vision_result',
- ':vision_config',
- ':target_finder',
- '//aos/logging:logging',
- '//aos/logging:implementations',
- '//aos/time:time',
- '//aos/vision/image:reader',
- '//aos/vision/image:jpeg_routines',
- '//aos/vision/image:image_stream',
- '//aos/vision/events:udp',
- '//aos/vision/events:epoll_events',
- '//aos/vision/events:socket_types',
- '//aos/vision/blob:range_image',
- '//aos/vision/blob:codec',
- '//aos/vision/blob:find_blob',
- '//aos/vision/blob:threshold',
- ],
+ name = "target_sender",
+ srcs = [
+ "target_sender.cc",
+ ],
+ deps = [
+ ":target_finder",
+ ":vision_config",
+ ":vision_result",
+ "//aos/logging",
+ "//aos/logging:implementations",
+ "//aos/time",
+ "//aos/vision/blob:codec",
+ "//aos/vision/blob:find_blob",
+ "//aos/vision/blob:range_image",
+ "//aos/vision/blob:threshold",
+ "//aos/vision/events:epoll_events",
+ "//aos/vision/events:socket_types",
+ "//aos/vision/events:udp",
+ "//aos/vision/image:image_stream",
+ "//aos/vision/image:jpeg_routines",
+ "//aos/vision/image:reader",
+ ],
)
cc_binary(
- name = 'target_receiver',
- srcs = [
- 'target_receiver.cc',
- ],
- visibility = ['//visibility:public'],
- deps = [
- '//aos/logging',
- '//aos/logging:queue_logging',
- '//aos:init',
- '//aos/time:time',
- '//aos/vision/events:udp',
- ':vision_queue',
- ':vision_result',
- ':target_finder',
- '//aos/mutex:mutex',
- ],
+ name = "target_receiver",
+ srcs = [
+ "target_receiver.cc",
+ ],
+ visibility = ["//visibility:public"],
+ deps = [
+ ":target_finder",
+ ":vision_queue",
+ ":vision_result",
+ "//aos:init",
+ "//aos/logging",
+ "//aos/logging:queue_logging",
+ "//aos/mutex",
+ "//aos/time",
+ "//aos/vision/events:udp",
+ ],
)
cc_library(
- name = 'target_finder',
- srcs = ['target_finder.cc'],
- hdrs = ['target_finder.h'],
- deps = [
- '//aos/vision/blob:threshold',
- '//aos/vision/blob:transpose',
- '//aos/vision/debug:overlay',
- '//aos/vision/math:vector',
- ],
+ name = "target_finder",
+ srcs = ["target_finder.cc"],
+ hdrs = ["target_finder.h"],
+ deps = [
+ "//aos/vision/blob:threshold",
+ "//aos/vision/blob:transpose",
+ "//aos/vision/debug:overlay",
+ "//aos/vision/math:vector",
+ ],
)
gtk_dependent_cc_binary(
- name = 'debug_viewer',
- srcs = ['debug_viewer.cc'],
- deps = [
- ':target_finder',
- '//aos/vision/blob:threshold',
- '//aos/vision/blob:transpose',
- '//aos/vision/blob:move_scale',
- '//aos/vision/math:vector',
- '//aos/vision/debug:debug_framework',
- ]
+ name = "debug_viewer",
+ srcs = ["debug_viewer.cc"],
+ deps = [
+ ":target_finder",
+ "//aos/vision/blob:move_scale",
+ "//aos/vision/blob:threshold",
+ "//aos/vision/blob:transpose",
+ "//aos/vision/debug:debug_framework",
+ "//aos/vision/math:vector",
+ ],
)