commit f97244416c78a4cd37eb8e86e0d3e5c0386e0922
author Austin Schuh <austin.linux@gmail.com> Sun Oct 28 20:30:21 2018 -0700
committer Austin Schuh <austin.linux@gmail.com> Sun Oct 28 21:24:19 2018 -0700
tree 01323ef3e065b0e19303c415142c800861988c8c
parent 93375c3161f4088163f660bbc5a10b27ab712ea7
parent 40c1652515ce9827fe3b1c5ab57cdd7e612062cd

Upgrade protobuf to v3.6.1

Merge commit 'be9845eb2abf508c86da76321b4e2c352b45b532' into master

Change-Id: I1b3cd2e177686afe95f44abc4fb0c6f9e001e784

y2018/BUILD

diff --git a/y2018/BUILD b/y2018/BUILD
index dbed8bd..09d2bc9 100644
--- a/y2018/BUILD
+++ b/y2018/BUILD
@@ -1,6 +1,6 @@
 load("//aos/downloader:downloader.bzl", "aos_downloader")
 load("//aos/build:queues.bzl", "queue_library")
-load("//tools/build_rules:protobuf.bzl", "proto_cc_library")
+load("@com_google_protobuf//:protobuf.bzl", "cc_proto_library")
 
 aos_downloader(
     name = "download",
@@ -43,15 +43,15 @@
     ],
     deps = [
         ":vision_proto",
-        "//aos/stl_mutex:stl_mutex",
-        "//aos/time:time",
+        "//aos:init",
         "//aos/actions:action_lib",
-        "//aos/logging",
-        "//aos/network:team_number",
-        "//aos/util:log_interval",
         "//aos/input:drivetrain_input",
         "//aos/input:joystick_input",
-        "//aos:init",
+        "//aos/logging",
+        "//aos/network:team_number",
+        "//aos/stl_mutex",
+        "//aos/time",
+        "//aos/util:log_interval",
         "//aos/vision/events:udp",
         "//frc971/autonomous:auto_queue",
         "//frc971/autonomous:base_autonomous_actor",
@@ -73,8 +73,8 @@
     visibility = ["//visibility:public"],
     deps = [
         "//aos:once",
-        "//aos/mutex:mutex",
         "//aos/logging",
+        "//aos/mutex",
         "//aos/network:team_number",
         "//frc971:constants",
         "//frc971/shooter_interpolation:interpolation",
@@ -92,17 +92,17 @@
     restricted_to = ["//tools:roborio"],
     deps = [
         ":status_light",
+        "//aos:init",
         "//aos:math",
-        "//aos/stl_mutex:stl_mutex",
-        "//aos/time:time",
         "//aos/controls:control_loop",
         "//aos/logging",
         "//aos/logging:queue_logging",
-        "//aos/robot_state:robot_state",
+        "//aos/robot_state",
+        "//aos/stl_mutex",
+        "//aos/time",
         "//aos/util:log_interval",
         "//aos/util:phased_loop",
         "//aos/util:wrapping_counter",
-        "//aos:init",
         "//frc971/autonomous:auto_queue",
         "//frc971/control_loops:queues",
         "//frc971/control_loops/drivetrain:drivetrain_queue",
@@ -134,9 +134,9 @@
     visibility = ["//visibility:public"],
 )
 
-proto_cc_library(
+cc_proto_library(
     name = "vision_proto",
-    src = "vision.proto",
+    srcs = ["vision.proto"],
     visibility = ["//visibility:public"],
 )