1 files changed, 74 insertions, 55 deletions
diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD
index 2607b9d704..1833d67d82 100644
--- a/tensorflow/tools/pip_package/BUILD
+++ b/tensorflow/tools/pip_package/BUILD
@@ -48,65 +48,36 @@ py_binary(
     deps = ["//tensorflow:tensorflow_py"],
 )
 
-COMMON_PIP_DEPS = [
-    ":licenses",
-    "MANIFEST.in",
-    "README",
-    "setup.py",
-    ":included_headers",
-    "//tensorflow:tensorflow_py",
-    "//tensorflow/contrib/boosted_trees:boosted_trees_pip",
-    "//tensorflow/contrib/cluster_resolver:cluster_resolver_pip",
-    "//tensorflow/contrib/data/python/kernel_tests:dataset_serialization_test",
-    "//tensorflow/contrib/data/python/ops:contrib_op_loader",
-    "//tensorflow/contrib/eager/python/examples:examples_pip",
-    "//tensorflow/contrib/eager/python:checkpointable_utils",
-    "//tensorflow/contrib/eager/python:evaluator",
-    "//tensorflow/contrib/gan:gan",
-    "//tensorflow/contrib/graph_editor:graph_editor_pip",
-    "//tensorflow/contrib/keras:keras",
-    "//tensorflow/contrib/labeled_tensor:labeled_tensor_pip",
-    "//tensorflow/contrib/nn:nn_py",
-    "//tensorflow/contrib/predictor:predictor_pip",
-    "//tensorflow/contrib/py2tf:py2tf",
-    "//tensorflow/contrib/py2tf/converters:converters",
-    "//tensorflow/contrib/py2tf/converters:test_lib",
-    "//tensorflow/contrib/py2tf/impl:impl",
-    "//tensorflow/contrib/py2tf/pyct:pyct",
-    "//tensorflow/contrib/py2tf/pyct/static_analysis:static_analysis",
-    "//tensorflow/contrib/receptive_field:receptive_field_pip",
-    "//tensorflow/contrib/session_bundle:session_bundle_pip",
-    "//tensorflow/contrib/signal:signal_py",
-    "//tensorflow/contrib/signal:test_util",
-    "//tensorflow/contrib/slim:slim",
-    "//tensorflow/contrib/slim/python/slim/data:data_pip",
-    "//tensorflow/contrib/slim/python/slim/nets:nets_pip",
-    "//tensorflow/contrib/specs:specs",
-    "//tensorflow/contrib/summary:summary_test_util",
-    "//tensorflow/contrib/tensor_forest:init_py",
-    "//tensorflow/contrib/tensor_forest/hybrid:hybrid_pip",
-    "//tensorflow/contrib/timeseries:timeseries_pip",
-    "//tensorflow/contrib/tpu",
-    "//tensorflow/examples/tutorials/mnist:package",
-    "//tensorflow/python:distributed_framework_test_lib",
-    "//tensorflow/python:meta_graph_testdata",
-    "//tensorflow/python:spectral_ops_test_util",
-    "//tensorflow/python:util_example_parser_configuration",
-    "//tensorflow/python/debug:debug_pip",
-    "//tensorflow/python/eager:eager_pip",
-    "//tensorflow/python/saved_model:saved_model",
-    "//tensorflow/python/tools:tools_pip",
-    "//tensorflow/python:test_ops",
-    "//tensorflow/tools/dist_test/server:grpc_tensorflow_server",
-]
-
 # On Windows, python binary is a zip file of runfiles tree.
 # Add everything to its data dependency for generating a runfiles tree
 # for building the pip package on Windows.
 py_binary(
     name = "simple_console_for_windows",
     srcs = ["simple_console_for_windows.py"],
-    data = COMMON_PIP_DEPS,
+    data = [
+        "MANIFEST.in",
+        "README",
+        "setup.py",
+        ":included_headers",
+        "//tensorflow/contrib/nn:nn_py",
+        "//tensorflow/contrib/session_bundle:session_bundle_pip",
+        "//tensorflow/contrib/signal:signal_py",
+        "//tensorflow/contrib/slim/python/slim/data:data_pip",
+        "//tensorflow/python:util_example_parser_configuration",
+        "//tensorflow/python/debug:debug_pip",
+        "//tensorflow/python/saved_model",
+        "//tensorflow/python:spectral_ops_test_util",
+        "//tensorflow/python/tools:tools_pip",
+        "//tensorflow/python/eager:eager_pip",
+        "//tensorflow/contrib/summary:summary_test_util",
+        # These targets don't build on Windows yet. Exclude them for now.
+        # "//tensorflow/contrib/slim",
+        # "//tensorflow/contrib/slim/python/slim/nets:nets_pip",
+        # "//tensorflow/contrib/specs",
+        # "//tensorflow/contrib/tensor_forest:init_py",
+        # "//tensorflow/contrib/tensor_forest/hybrid:hybrid_pip",
+        # "//tensorflow/examples/tutorials/mnist:package",
+    ],
     srcs_version = "PY2AND3",
     deps = ["//tensorflow:tensorflow_py"],
 )
@@ -137,7 +108,6 @@ filegroup(
         "@highwayhash//:LICENSE",
         "@jemalloc//:COPYING",
         "@jpeg//:LICENSE.md",
-        "@kafka//:LICENSE",
         "@libxsmm_archive//:LICENSE",
         "@lmdb//:LICENSE",
         "@local_config_sycl//sycl:LICENSE.text",
@@ -167,12 +137,61 @@ sh_binary(
     data = select({
         "//tensorflow:windows": [":simple_console_for_windows"],
         "//tensorflow:windows_msvc": [":simple_console_for_windows"],
-        "//conditions:default": COMMON_PIP_DEPS + [
+        "//conditions:default": [
+            ":licenses",
+            "MANIFEST.in",
+            "README",
+            "setup.py",
+            ":included_headers",
             ":simple_console",
+            "//tensorflow:tensorflow_py",
+            "//tensorflow/contrib/boosted_trees:boosted_trees_pip",
+            "//tensorflow/contrib/cluster_resolver:cluster_resolver_pip",
+            "//tensorflow/contrib/data/python/kernel_tests:dataset_serialization_test",
+            "//tensorflow/contrib/data/python/ops:contrib_op_loader",
+            "//tensorflow/contrib/eager/python/examples:examples_pip",
+            "//tensorflow/contrib/eager/python:checkpointable_utils",
+            "//tensorflow/contrib/eager/python:evaluator",
+            "//tensorflow/contrib/gan:gan",
+            "//tensorflow/contrib/graph_editor:graph_editor_pip",
+            "//tensorflow/contrib/keras:keras",
+            "//tensorflow/contrib/labeled_tensor:labeled_tensor_pip",
             "//tensorflow/contrib/lite/python:interpreter_test_data",
             "//tensorflow/contrib/lite/toco:toco",
             "//tensorflow/contrib/lite/toco/python:toco_wrapper",
             "//tensorflow/contrib/lite/toco/python:toco_from_protos",
+            "//tensorflow/contrib/nn:nn_py",
+            "//tensorflow/contrib/predictor:predictor_pip",
+            "//tensorflow/contrib/py2tf:py2tf",
+            "//tensorflow/contrib/py2tf/converters:converters",
+            "//tensorflow/contrib/py2tf/converters:test_lib",
+            "//tensorflow/contrib/py2tf/impl:impl",
+            "//tensorflow/contrib/py2tf/pyct:pyct",
+            "//tensorflow/contrib/py2tf/pyct/static_analysis:static_analysis",
+            "//tensorflow/contrib/receptive_field:receptive_field_pip",
+            "//tensorflow/contrib/session_bundle:session_bundle_pip",
+            "//tensorflow/contrib/signal:signal_py",
+            "//tensorflow/contrib/signal:test_util",
+            "//tensorflow/contrib/slim:slim",
+            "//tensorflow/contrib/slim/python/slim/data:data_pip",
+            "//tensorflow/contrib/slim/python/slim/nets:nets_pip",
+            "//tensorflow/contrib/specs:specs",
+            "//tensorflow/contrib/summary:summary_test_util",
+            "//tensorflow/contrib/tensor_forest:init_py",
+            "//tensorflow/contrib/tensor_forest/hybrid:hybrid_pip",
+            "//tensorflow/contrib/timeseries:timeseries_pip",
+            "//tensorflow/contrib/tpu",
+            "//tensorflow/examples/tutorials/mnist:package",
+            "//tensorflow/python:distributed_framework_test_lib",
+            "//tensorflow/python:meta_graph_testdata",
+            "//tensorflow/python:spectral_ops_test_util",
+            "//tensorflow/python:util_example_parser_configuration",
+            "//tensorflow/python/debug:debug_pip",
+            "//tensorflow/python/eager:eager_pip",
+            "//tensorflow/python/saved_model:saved_model",
+            "//tensorflow/python/tools:tools_pip",
+            "//tensorflow/python:test_ops",
+            "//tensorflow/tools/dist_test/server:grpc_tensorflow_server",
         ],
     }) + if_mkl(["//third_party/mkl:intel_binary_blob"]) + if_tensorrt([
         "//tensorflow/contrib/tensorrt:init_py",