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

aos/protobuf/BUILD

diff --git a/aos/protobuf/BUILD b/aos/protobuf/BUILD
index 69c49d1..4d6a107 100644
--- a/aos/protobuf/BUILD
+++ b/aos/protobuf/BUILD
@@ -1,22 +1,22 @@
-package(default_visibility = ['//visibility:public'])
+package(default_visibility = ["//visibility:public"])
 
 cc_library(
-  name = "stack_arena",
-  srcs = ["stack_arena.cc"],
-  hdrs = ["stack_arena.h"],
-  deps = [
-    "//aos/logging:logging",
-    "//third_party/protobuf",
-  ],
+    name = "stack_arena",
+    srcs = ["stack_arena.cc"],
+    hdrs = ["stack_arena.h"],
+    deps = [
+        "//aos/logging",
+        "@com_google_protobuf//:protobuf",
+    ],
 )
 
 cc_test(
-  name = "stack_arena_test",
-  srcs = ["stack_arena_test.cc"],
-  deps = [
-    ":stack_arena",
-    "//aos/testing:test_logging",
-    "//aos/logging:logging",
-    "//aos/testing:googletest",
-  ],
+    name = "stack_arena_test",
+    srcs = ["stack_arena_test.cc"],
+    deps = [
+        ":stack_arena",
+        "//aos/logging",
+        "//aos/testing:googletest",
+        "//aos/testing:test_logging",
+    ],
 )

aos/vision/events/BUILD

diff --git a/aos/vision/events/BUILD b/aos/vision/events/BUILD
index 359822c..02a4321 100644
--- a/aos/vision/events/BUILD
+++ b/aos/vision/events/BUILD
@@ -10,9 +10,9 @@
         "//tools:armhf-debian",
     ],
     deps = [
-        "//aos/scoped:scoped_fd",
-        "//aos/time:time",
         "//aos/logging",
+        "//aos/scoped:scoped_fd",
+        "//aos/time",
     ],
 )
 
@@ -25,7 +25,7 @@
     deps = [
         "//aos/vision/events:tcp_server",
         "//aos/vision/image:image_types",
-        "//third_party/protobuf",
+        "@com_google_protobuf//:protobuf",
     ],
 )
 

aos/vision/image/BUILD

diff --git a/aos/vision/image/BUILD b/aos/vision/image/BUILD
index 39c40d6..1caab3b 100644
--- a/aos/vision/image/BUILD
+++ b/aos/vision/image/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools/build_rules:protobuf.bzl", "proto_cc_library")
+load("@com_google_protobuf//:protobuf.bzl", "cc_proto_library")
 
 cc_library(
     name = "image_types",
@@ -13,9 +13,9 @@
     ],
 )
 
-proto_cc_library(
+cc_proto_library(
     name = "camera_params",
-    src = "camera_params.proto",
+    srcs = ["camera_params.proto"],
     compatible_with = [
         "//tools:armhf-debian",
     ],
@@ -34,8 +34,8 @@
     deps = [
         ":camera_params",
         ":image_types",
-        "//aos/time:time",
         "//aos/logging",
+        "//aos/time",
     ],
 )