Cleanup usage of the protobuf workspace.

tensorflow/compiler/xla/service/interpreter/BUILD

@@ -61,8 +61,8 @@ cc_library(
     srcs = ["platform_id.cc"],
     hdrs = ["platform_id.h"],
     deps = ["//tensorflow/core:stream_executor_headers_lib"] + if_static(
-        ["@protobuf_archive//:protobuf"],
-        ["@protobuf_archive//:protobuf_headers"],
+        ["@com_google_protobuf//:protobuf"],
+        ["@com_google_protobuf//:protobuf_headers"],
     ),
 )
 

tensorflow/compiler/xla/xla.bzl

@@ -13,10 +13,10 @@ def xla_proto_library(name, srcs=[], deps=[], visibility=None, testonly=0, **kwa
                    srcs=srcs,
                    deps=deps,
                    cc_libs = if_static(
-                       ["@protobuf_archive//:protobuf"],
-                       otherwise=["@protobuf_archive//:protobuf_headers"],
+                       ["@com_google_protobuf//:protobuf"],
+                       otherwise=["@com_google_protobuf//:protobuf_headers"],
                    ),
-                   protoc="@protobuf_archive//:protoc",
+                   protoc="@com_google_protobuf//:protoc",
                    testonly=testonly,
                    visibility=visibility,
                    **kwargs)

tensorflow/contrib/factorization/kernels/BUILD

@@ -14,7 +14,7 @@ cc_library(
         ":clustering_ops",
         ":masked_matmul_ops",
         ":wals_solver_ops",
-        "@protobuf_archive//:protobuf_headers",
+        "@com_google_protobuf//:protobuf_headers",
     ],
 )
 
@@ -24,7 +24,7 @@ cc_library(
     deps = [
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
-        "@protobuf_archive//:protobuf_headers",
+        "@com_google_protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )
@@ -35,7 +35,7 @@ cc_library(
     deps = [
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
-        "@protobuf_archive//:protobuf_headers",
+        "@com_google_protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )
@@ -47,7 +47,7 @@ cc_library(
         "//tensorflow/core:framework_headers_lib",
         "//tensorflow/core/kernels:bounds_check",
         "//third_party/eigen3",
-        "@protobuf_archive//:protobuf_headers",
+        "@com_google_protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )

tensorflow/contrib/ffmpeg/default/BUILD

@@ -20,7 +20,7 @@ cc_library(
     deps = [
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
-        "@protobuf_archive//:protobuf_headers",
+        "@com_google_protobuf//:protobuf_headers",
     ],
 )
 

tensorflow/contrib/hadoop/BUILD

@@ -46,7 +46,7 @@ cc_library(
     deps = [
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
-        "@protobuf_archive//:protobuf_headers",
+        "@com_google_protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )

tensorflow/contrib/ignite/BUILD

@@ -67,7 +67,7 @@ cc_library(
     deps = [
         "//tensorflow/core:framework_headers_lib",
         "@boringssl//:ssl",
-        "@protobuf_archive//:protobuf_headers",
+        "@com_google_protobuf//:protobuf_headers",
     ],
 )
 
@@ -86,7 +86,7 @@ cc_library(
         ":ignite_client",
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
-        "@protobuf_archive//:protobuf_headers",
+        "@com_google_protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )

tensorflow/contrib/image/BUILD

@@ -353,7 +353,7 @@ tf_custom_op_library(
         "ops/single_image_random_dot_stereograms_ops.cc",
     ],
     deps = [
-        "@protobuf_archive//:protobuf",
+        "@com_google_protobuf//:protobuf",
     ],
 )
 

tensorflow/contrib/input_pipeline/kernels/BUILD

@@ -13,7 +13,7 @@ cc_library(
     deps = [
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
-        "@protobuf_archive//:protobuf_headers",
+        "@com_google_protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )

tensorflow/contrib/kafka/BUILD

@@ -39,8 +39,8 @@ cc_library(
     deps = [
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
+        "@com_google_protobuf//:protobuf_headers",
         "@kafka",
-        "@protobuf_archive//:protobuf_headers",
     ],
     alwayslink = 1,
 )

tensorflow/contrib/kinesis/BUILD

@@ -43,7 +43,7 @@ cc_library(
         "//tensorflow/core/platform/s3:aws_crypto",
         "//third_party/eigen3",
         "@aws",
-        "@protobuf_archive//:protobuf_headers",
+        "@com_google_protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )

tensorflow/contrib/layers/kernels/BUILD

@@ -13,8 +13,8 @@ cc_library(
     deps = [
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
+        "@com_google_protobuf//:protobuf_headers",
         "@farmhash_archive//:farmhash",
-        "@protobuf_archive//:protobuf_headers",
     ],
     alwayslink = 1,
 )

tensorflow/contrib/periodic_resample/BUILD

@@ -21,7 +21,7 @@ cc_library(
     deps = [
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
-        "@protobuf_archive//:protobuf_headers",
+        "@com_google_protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )

tensorflow/contrib/proto/python/kernel_tests/BUILD

@@ -109,7 +109,7 @@ py_library(
         ":proto_op_test_base",
         "//third_party/py/numpy",
         "@absl_py//absl/testing:parameterized",
-        "@protobuf_archive//:protobuf_python",
+        "@com_google_protobuf//:protobuf_python",
     ],
 )
 

tensorflow/contrib/tensor_forest/BUILD

@@ -42,7 +42,7 @@ cc_library(
         ":tree_utils",
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
-        "@protobuf_archive//:protobuf_headers",
+        "@com_google_protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )
@@ -387,7 +387,7 @@ cc_library(
     deps = [
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
-        "@protobuf_archive//:protobuf_headers",
+        "@com_google_protobuf//:protobuf_headers",
     ],
 )
 
@@ -411,7 +411,7 @@ tf_cc_shared_object(
     deps = [
         ":forest_proto_impl",
         "//tensorflow/contrib/tensor_forest/kernels/v4:decision-tree-resource_impl",
-        "@protobuf_archive//:protobuf",
+        "@com_google_protobuf//:protobuf",
     ],
 )
 

tensorflow/contrib/tensor_forest/hybrid/BUILD

@@ -76,7 +76,7 @@ cc_library(
     deps = [
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
-        "@protobuf_archive//:protobuf_headers",
+        "@com_google_protobuf//:protobuf_headers",
     ],
 )
 

tensorflow/contrib/tensorrt/BUILD

@@ -375,7 +375,7 @@ cc_library(
         "//tensorflow/core:graph",
         "//tensorflow/core:lib_proto_parsing",
         "//tensorflow/core:protos_all_cc",
-        "@protobuf_archive//:protobuf_headers",
+        "@com_google_protobuf//:protobuf_headers",
     ],
 )
 

tensorflow/core/BUILD

@@ -426,7 +426,7 @@ cc_library(
         ":platform_base",
         ":platform_port",
         "//tensorflow/core/platform/default/build_config:protobuf",
-        "@protobuf_archive//:protobuf",
+        "@com_google_protobuf//:protobuf",
     ],
 )
 
@@ -1661,9 +1661,9 @@ cc_library(
         ":protos_all_cc_impl",
         ":stats_calculator_portable",
         "//third_party/eigen3",
+        "@com_google_protobuf//:protobuf",
         "@double_conversion//:double-conversion",
         "@nsync//:nsync_cpp",
-        "@protobuf_archive//:protobuf",
     ],
     alwayslink = 1,
 )
@@ -1694,9 +1694,9 @@ cc_library(
         ":protos_all_cc_impl",
         "//third_party/eigen3",
         "//third_party/fft2d:fft2d_headers",
+        "@com_google_protobuf//:protobuf",
         "@fft2d",
         "@gemmlowp",
-        "@protobuf_archive//:protobuf",
     ],
     alwayslink = 1,
 )
@@ -1711,9 +1711,9 @@ cc_library(
         ":protos_all_cc_impl",
         ":stats_calculator_portable",
         "//third_party/eigen3",
+        "@com_google_protobuf//:protobuf",
         "@double_conversion//:double-conversion",
         "@nsync//:nsync_cpp",
-        "@protobuf_archive//:protobuf",
     ],
     alwayslink = 1,
 )
@@ -1752,7 +1752,7 @@ cc_library(
         ":protos_all_cc_impl",
         "//tensorflow/core/kernels:android_tensorflow_kernels",
         "//third_party/eigen3",
-        "@protobuf_archive//:protobuf",
+        "@com_google_protobuf//:protobuf",
     ],
     alwayslink = 1,
 )
@@ -1776,9 +1776,9 @@ cc_library(
     deps = [
         ":protos_all_cc_impl",
         "//third_party/eigen3",
+        "@com_google_protobuf//:protobuf",
         "@double_conversion//:double-conversion",
         "@nsync//:nsync_cpp",
-        "@protobuf_archive//:protobuf",
     ],
     alwayslink = 1,
 )
@@ -1800,9 +1800,9 @@ cc_library(
     deps = [
         ":protos_all_cc_impl",
         "//third_party/eigen3",
+        "@com_google_protobuf//:protobuf",
         "@double_conversion//:double-conversion",
         "@nsync//:nsync_cpp",
-        "@protobuf_archive//:protobuf",
     ],
     alwayslink = 1,
 )
@@ -2217,10 +2217,10 @@ cc_library(
         ":core_stringpiece",
         "//third_party/eigen3",
         "//tensorflow/core/platform/default/build_config:platformlib",
+        "@com_google_protobuf//:protobuf",
         "@snappy",
         "@zlib_archive//:zlib",
         "@double_conversion//:double-conversion",
-        "@protobuf_archive//:protobuf",
     ] + tf_protos_all_impl() + tf_protos_grappler_impl(),
 )
 
@@ -2548,10 +2548,10 @@ tf_cuda_library(
     ] + if_static(
         extra_deps = [
             ":framework_internal_impl",
-            "@protobuf_archive//:protobuf",
+            "@com_google_protobuf//:protobuf",
         ],
         otherwise = [
-            "@protobuf_archive//:protobuf_headers",
+            "@com_google_protobuf//:protobuf_headers",
         ],
     ),
     alwayslink = 1,
@@ -2645,8 +2645,8 @@ tf_cuda_library(
         "//tensorflow/core/kernels:bounds_check",
         "//third_party/eigen3",
     ] + if_static(
-        extra_deps = ["@protobuf_archive//:protobuf"],
-        otherwise = ["@protobuf_archive//:protobuf_headers"],
+        extra_deps = ["@com_google_protobuf//:protobuf"],
+        otherwise = ["@com_google_protobuf//:protobuf_headers"],
     ) + mkl_deps(),
     alwayslink = 1,
 )

tensorflow/core/kernels/BUILD

@@ -5727,9 +5727,9 @@ cc_library(
         "//tensorflow/core:protos_all_cc_impl",
         "//third_party/eigen3",
         "//third_party/fft2d:fft2d_headers",
+        "@com_google_protobuf//:protobuf",
         "@fft2d",
         "@gemmlowp",
-        "@protobuf_archive//:protobuf",
     ],
     alwayslink = 1,
 )