Upgrade protobuf to v3.6.1
Merge commit 'be9845eb2abf508c86da76321b4e2c352b45b532' into master
Change-Id: I1b3cd2e177686afe95f44abc4fb0c6f9e001e784
diff --git a/y2016/vision/BUILD b/y2016/vision/BUILD
index 42fae12..4617f0c 100644
--- a/y2016/vision/BUILD
+++ b/y2016/vision/BUILD
@@ -1,4 +1,4 @@
-load("//tools/build_rules:protobuf.bzl", "proto_cc_library")
+load("@com_google_protobuf//:protobuf.bzl", "cc_proto_library")
load("//aos/build:queues.bzl", "queue_library")
load("//tools/build_rules:gtk_dependent.bzl", "gtk_dependent_cc_binary", "gtk_dependent_cc_library")
@@ -13,17 +13,17 @@
visibility = ["//visibility:public"],
)
-proto_cc_library(
+cc_proto_library(
name = "vision_data",
- src = "vision_data.proto",
+ srcs = ["vision_data.proto"],
compatible_with = [
"//tools:armhf-debian",
],
)
-proto_cc_library(
+cc_proto_library(
name = "calibration",
- src = "calibration.proto",
+ srcs = ["calibration.proto"],
compatible_with = [
"//tools:armhf-debian",
],
@@ -34,7 +34,7 @@
#include <string>
-#include "third_party/protobuf/src/google/protobuf/text_format.h"
+#include "external/com_google_protobuf/src/google/protobuf/text_format.h"
namespace y2016 {
namespace vision {
@@ -103,9 +103,9 @@
":calibration",
":stereo_geometry",
":vision_data",
- "//aos/time:time",
"//aos/logging",
"//aos/logging:implementations",
+ "//aos/time",
"//aos/vision/events:epoll_events",
"//aos/vision/events:socket_types",
"//aos/vision/events:udp",
@@ -149,11 +149,11 @@
":stereo_geometry",
":vision_data",
":vision_queue",
- "//aos/mutex:mutex",
- "//aos/time:time",
+ "//aos:init",
"//aos/logging",
"//aos/logging:queue_logging",
- "//aos:init",
+ "//aos/mutex",
+ "//aos/time",
"//aos/vision/events:udp",
"//frc971/control_loops/drivetrain:drivetrain_queue",
"//y2016:constants",