update bazel stuff

Author: qiwzhang

repositories.bzl

@@ -109,7 +109,7 @@ def protobuf_repositories(bind=True):
     )
 
     http_archive(
-        name = "protobuf_git",
+        name = "com_google_protobuf",
         strip_prefix = "protobuf-" + PROTOBUF_COMMIT,
         url = "https://github.com/google/protobuf/archive/v" + PROTOBUF_COMMIT + ".tar.gz",
         sha256 = PROTOBUF_SHA256,
@@ -118,32 +118,32 @@ def protobuf_repositories(bind=True):
     if bind:
         native.bind(
             name = "protoc",
-            actual = "@protobuf_git//:protoc",
+            actual = "@com_google_protobuf//:protoc",
         )
 
         native.bind(
             name = "protobuf",
-            actual = "@protobuf_git//:protobuf",
+            actual = "@com_google_protobuf//:protobuf",
         )
 
         native.bind(
             name = "cc_wkt_protos",
-            actual = "@protobuf_git//:cc_wkt_protos",
+            actual = "@com_google_protobuf//:cc_wkt_protos",
         )
 
         native.bind(
             name = "cc_wkt_protos_genproto",
-            actual = "@protobuf_git//:cc_wkt_protos_genproto",
+            actual = "@com_google_protobuf//:cc_wkt_protos_genproto",
         )
 
         native.bind(
             name = "protobuf_compiler",
-            actual = "@protobuf_git//:protoc_lib",
+            actual = "@com_google_protobuf//:protoc_lib",
         )
 
         native.bind(
             name = "protobuf_clib",
-            actual = "@protobuf_git//:protoc_lib",
+            actual = "@com_google_protobuf//:protoc_lib",
         )
 
 GOOGLETEST_COMMIT = "43863938377a9ea1399c0596269e0890b5c5515a"
@@ -238,7 +238,7 @@ cc_library(
 GOOGLEAPIS_COMMIT = "32a10f69e2c9ce15bba13ab1ff928bacebb25160" # May 20, 2019
 GOOGLEAPIS_SHA256 = "6861efa8619579e06e70dd4765cdf6cef1ecad6a1a2026ad750541e99552bf71"
 
-def googleapis_repositories(protobuf_repo="@protobuf_git//", bind=True):
+def googleapis_repositories(protobuf_repo="@com_google_protobuf//", bind=True):
     BUILD = """
 # Copyright 2016 Google Inc. All Rights Reserved.
 #

test/BUILD

@@ -16,8 +16,6 @@
 #
 package(default_visibility = ["//visibility:public"])
 
-load("@protobuf_git//:protobuf.bzl", "cc_proto_library")
-
 cc_test(
     name = "http_template_test",
     size = "small",
@@ -82,16 +80,16 @@ cc_test(
     ],
 )
 
-cc_proto_library(
-    name = "bookstore_test_proto",
+proto_library(
+    name = "bookstore_proto",
     testonly = 1,
     srcs = ["bookstore.proto"],
-    include = ".",
-    default_runtime = "//external:protobuf",
-    protoc = "//external:protoc",
-    deps = [
-        "//external:cc_wkt_protos",
-    ],
+)
+
+cc_proto_library(
+    name = "bookstore_cc_proto",
+    testonly = 1,
+    deps = [":bookstore_proto"],
 )
 
 cc_test(
@@ -136,7 +134,7 @@ cc_library(
         "request_translator_test_base.h",
     ],
     deps = [
-        ":bookstore_test_proto",
+        ":bookstore_cc_proto",
         ":test_common",
         "//external:googletest",
         "//external:protobuf",
@@ -156,7 +154,7 @@ cc_test(
         "testdata/bookstore_service.pb.txt",
     ],
     deps = [
-        ":bookstore_test_proto",
+        ":bookstore_cc_proto",
         ":request_translator_test_base",
         ":test_common",
         "//external:googletest_main",
@@ -174,7 +172,7 @@ cc_test(
         "testdata/bookstore_service.pb.txt",
     ],
     deps = [
-        ":bookstore_test_proto",
+        ":bookstore_cc_proto",
         ":request_translator_test_base",
         "//external:googletest_main",
         "//src:request_stream_translator",
@@ -191,7 +189,7 @@ cc_test(
         "testdata/bookstore_service.pb.txt",
     ],
     deps = [
-        ":bookstore_test_proto",
+        ":bookstore_cc_proto",
         ":request_translator_test_base",
         ":test_common",
         "//external:googletest_main",
@@ -222,7 +220,7 @@ cc_test(
         "testdata/bookstore_service.pb.txt",
     ],
     deps = [
-        ":bookstore_test_proto",
+        ":bookstore_cc_proto",
         ":test_common",
         "//external:googletest_main",
         "//src:message_reader",

test/json_request_translator_test.cc

@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include "bookstore.pb.h"
+#include "test/bookstore.pb.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "gtest/gtest.h"
 #include "proto_stream_tester.h"

test/request_message_translator_test.cc

@@ -19,7 +19,7 @@
 #include <memory>
 #include <string>
 
-#include "bookstore.pb.h"
+#include "test/bookstore.pb.h"
 #include "google/protobuf/struct.pb.h"
 #include "google/protobuf/type.pb.h"
 #include "gtest/gtest.h"

test/request_stream_translator_test.cc

@@ -19,7 +19,7 @@
 #include <memory>
 #include <string>
 
-#include "bookstore.pb.h"
+#include "test/bookstore.pb.h"
 #include "google/protobuf/type.pb.h"
 #include "gtest/gtest.h"
 #include "request_translator_test_base.h"

test/response_to_json_translator_test.cc

@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include "bookstore.pb.h"
+#include "test/bookstore.pb.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "google/protobuf/text_format.h"
 #include "grpc_transcoding/type_helper.h"