Depend on protobuf's header only library when building custom ops

Change: 149501122

BUILD

@@ -1,28 +0,0 @@
-# Description:
-# TensorFlow is an open source software library for numerical computation using
-# data flow graphs.
-
-package(
-    default_visibility = [
-        "//tensorflow:internal",
-        "//tensorflow_models:__subpackages__",
-    ],
-)
-
-licenses(["notice"])  # Apache 2.0
-
-exports_files(["LICENSE"])
-
-load(
-    "//tensorflow:tensorflow.bzl",
-    "cc_header_only_library",
-)
-
-cc_header_only_library(
-    name = "protobuf_headers",
-    includes = ["external/protobuf/src"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "@protobuf//:protobuf",
-    ],
-)

tensorflow/contrib/factorization/kernels/BUILD

@@ -14,17 +14,17 @@ cc_library(
         ":clustering_ops",
         ":masked_matmul_ops",
         ":wals_solver_ops",
-        "//:protobuf_headers",
+        "@protobuf//:protobuf_headers",
     ],
 )
 
 cc_library(
     name = "wals_solver_ops",
     srcs = ["wals_solver_ops.cc"],
     deps = [
-        "//:protobuf_headers",
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
+        "@protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )
@@ -33,9 +33,9 @@ cc_library(
     name = "clustering_ops",
     srcs = ["clustering_ops.cc"],
     deps = [
-        "//:protobuf_headers",
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
+        "@protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )
@@ -44,9 +44,9 @@ cc_library(
     name = "masked_matmul_ops",
     srcs = ["masked_matmul_ops.cc"],
     deps = [
-        "//:protobuf_headers",
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
+        "@protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )

tensorflow/contrib/ffmpeg/default/BUILD

@@ -16,8 +16,8 @@ cc_library(
         "//tensorflow/contrib/ffmpeg:ffmpeg_lib.h",
     ],
     deps = [
-        "//:protobuf_headers",
         "//tensorflow/core:framework_headers_lib",
+        "@protobuf//:protobuf_headers",
     ],
 )
 

tensorflow/contrib/input_pipeline/kernels/BUILD

@@ -11,9 +11,9 @@ cc_library(
     name = "input_pipeline_kernels",
     srcs = ["input_pipeline_kernels.cc"],
     deps = [
-        "//:protobuf_headers",
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
+        "@protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )

tensorflow/contrib/layers/kernels/BUILD

@@ -11,9 +11,9 @@ cc_library(
     name = "bucketization_kernel",
     srcs = ["bucketization_kernel.cc"],
     deps = [
-        "//:protobuf_headers",
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
+        "@protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )
@@ -22,10 +22,10 @@ cc_library(
     name = "sparse_feature_cross_kernel",
     srcs = ["sparse_feature_cross_kernel.cc"],
     deps = [
-        "//:protobuf_headers",
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
         "@farmhash_archive//:farmhash",
+        "@protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )

tensorflow/contrib/tensor_forest/BUILD

@@ -51,9 +51,9 @@ cc_library(
     srcs = [":custom_op_sources"],
     hdrs = [":custom_op_headers"],
     deps = [
-        "//:protobuf_headers",
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
+        "@protobuf//:protobuf_headers",
     ],
     alwayslink = 1,
 )
@@ -191,9 +191,9 @@ cc_library(
         "kernels/tree_utils.h",
     ],
     deps = [
-        "//:protobuf_headers",
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
+        "@protobuf//:protobuf_headers",
     ],
 )
 

tensorflow/contrib/tensor_forest/hybrid/BUILD

@@ -67,9 +67,9 @@ cc_library(
         "core/ops/utils.h",
     ],
     deps = [
-        "//:protobuf_headers",
         "//tensorflow/core:framework_headers_lib",
         "//third_party/eigen3",
+        "@protobuf//:protobuf_headers",
     ],
 )
 

tensorflow/python/BUILD

@@ -254,8 +254,8 @@ cc_binary(
     }),
     linkshared = 1,
     deps = [
-        "//:protobuf_headers",
         "//tensorflow/core:framework_headers_lib",
+        "@protobuf//:protobuf_headers",
     ],
 )
 

tensorflow/tensorflow.bzl

@@ -679,7 +679,7 @@ def cc_header_only_library(name, deps=[], **kwargs):
 
 def tf_custom_op_library_additional_deps():
   return [
-      "//:protobuf_headers",
+      "@protobuf//:protobuf_headers",
       "//third_party/eigen3",
       "//tensorflow/core:framework_headers_lib",
   ]

tensorflow/tools/pip_package/BUILD

@@ -77,7 +77,6 @@ py_binary(
 filegroup(
     name = "licenses",
     data = [
-        "//:LICENSE",
         "//third_party/eigen3:LICENSE",
         "//third_party/hadoop:LICENSE.txt",
         "@boringssl//:LICENSE",