Upgrade protobuf to v3.6.1
Merge commit 'be9845eb2abf508c86da76321b4e2c352b45b532' into master
Change-Id: I1b3cd2e177686afe95f44abc4fb0c6f9e001e784
diff --git a/build_tests/BUILD b/build_tests/BUILD
index 81b7c8d..12a979f 100644
--- a/build_tests/BUILD
+++ b/build_tests/BUILD
@@ -1,97 +1,98 @@
-load('//tools/build_rules:ruby.bzl', 'ruby_binary')
-load('//aos/build:queues.bzl', 'queue_library')
-load('//tools/build_rules:protobuf.bzl', 'proto_cc_library')
+load("//tools/build_rules:ruby.bzl", "ruby_binary")
+load("//aos/build:queues.bzl", "queue_library")
+load("@com_google_protobuf//:protobuf.bzl", "cc_proto_library")
cc_test(
- name = 'gflags_build_test',
- srcs = [
- 'gflags.cc',
- ],
- deps = [
- '//third_party/gflags',
- ],
- size = 'small',
+ name = "gflags_build_test",
+ size = "small",
+ srcs = [
+ "gflags.cc",
+ ],
+ deps = [
+ "//third_party/gflags",
+ ],
)
ruby_binary(
- name = 'ruby_binary',
- srcs = [
- 'ruby.rb',
- 'ruby_to_require.rb',
- ],
- data = [
- 'ruby_to_require.rb',
- ],
+ name = "ruby_binary",
+ srcs = [
+ "ruby.rb",
+ "ruby_to_require.rb",
+ ],
+ data = [
+ "ruby_to_require.rb",
+ ],
)
sh_test(
- name = 'ruby_build_test',
- srcs = [
- 'ruby_check.sh',
- ],
- data = [
- ':ruby_binary',
- ],
- size = 'small',
+ name = "ruby_build_test",
+ size = "small",
+ srcs = [
+ "ruby_check.sh",
+ ],
+ data = [
+ ":ruby_binary",
+ ],
)
queue_library(
- name = 'queue_library',
- srcs = [
- 'queue.q',
- ],
+ name = "queue_library",
+ srcs = [
+ "queue.q",
+ ],
)
cc_test(
- name = 'queue_build_test',
- srcs = [
- 'queue.cc',
- ],
- deps = [
- ':queue_library',
- ],
- size = 'small',
+ name = "queue_build_test",
+ size = "small",
+ srcs = [
+ "queue.cc",
+ ],
+ deps = [
+ ":queue_library",
+ ],
)
cc_binary(
- name = 'tcmalloc_build_test_binary',
- srcs = [
- 'tcmalloc.cc',
- ],
+ name = "tcmalloc_build_test_binary",
+ srcs = [
+ "tcmalloc.cc",
+ ],
)
sh_test(
- name = 'tcmalloc_build_test',
- srcs = [
- 'tcmalloc_test.sh',
- ],
- data = [
- ':tcmalloc_build_test_binary',
- ],
- size = 'small',
+ name = "tcmalloc_build_test",
+ size = "small",
+ srcs = [
+ "tcmalloc_test.sh",
+ ],
+ data = [
+ ":tcmalloc_build_test_binary",
+ ],
)
-proto_cc_library(
- name = 'proto_build_test_library',
- src = 'proto.proto',
- deps = [
- ':proto_build_test_library_base',
- ],
+cc_proto_library(
+ name = "proto_build_test_library",
+ srcs = ["proto.proto"],
+ deps = [
+ ":proto_build_test_library_base",
+ "@com_google_protobuf//:cc_wkt_protos",
+ ],
)
-proto_cc_library(
- name = 'proto_build_test_library_base',
- src = 'proto_base.proto',
+cc_proto_library(
+ name = "proto_build_test_library_base",
+ srcs = ["proto_base.proto"],
)
cc_test(
- name = 'proto_build_test',
- srcs = [
- 'proto.cc',
- ],
- deps = [
- ':proto_build_test_library',
- '//aos/testing:googletest',
- ],
- size = 'small',
+ name = "proto_build_test",
+ size = "small",
+ srcs = [
+ "proto.cc",
+ ],
+ deps = [
+ ":proto_build_test_library",
+ "//aos/testing:googletest",
+ ],
)