Add placeholder plugins list to tensorflow/python:pywrap_tensorflow build target.

Add missing zlib dependency to LLVM build file.
Various other small cleanups.
Change: 141557751

tensorflow/core/platform/default/build_config.bzl

@@ -182,3 +182,6 @@ def tf_additional_lib_deps():
   if WITH_HDFS_SUPPORT:
     deps.append("//tensorflow/core/platform/hadoop:hadoop_file_system")
   return deps
+
+def tf_additional_plugin_deps():
+  return []

tensorflow/python/BUILD

@@ -21,6 +21,7 @@ load("//tensorflow:tensorflow.bzl", "cuda_py_tests")
 load("//tensorflow/core:platform/default/build_config.bzl", "tf_proto_library")
 load("//tensorflow/core:platform/default/build_config.bzl", "tf_proto_library_py")
 load("//tensorflow/core:platform/default/build_config.bzl", "tf_additional_lib_deps")
+load("//tensorflow/core:platform/default/build_config.bzl", "tf_additional_plugin_deps")
 load("//tensorflow/python:build_defs.bzl", "tf_gen_op_wrapper_private_py")
 
 py_library(
@@ -2031,7 +2032,7 @@ tf_py_wrap_cc(
         "//tensorflow/core/distributed_runtime:server_lib",
         "//tensorflow/tools/tfprof/internal:print_model_analysis",
         "//util/python:python_headers",
-    ] + tf_additional_lib_deps(),
+    ] + tf_additional_lib_deps() + tf_additional_plugin_deps(),
 )
 
 py_library(

third_party/llvm/BUILD

@@ -3,5 +3,6 @@ licenses(["notice"])
 py_binary(
     name = "expand_cmake_vars",
     srcs = ["expand_cmake_vars.py"],
+    srcs_version = "PY2AND3",
     visibility = ["@llvm//:__subpackages__"],
 )

third_party/llvm/expand_cmake_vars.py

@@ -47,7 +47,7 @@ def _expand_variables(input_str, cmake_vars):
     The expanded string.
   """
   def replace(match):
-    if cmake_vars.has_key(match.group(1)):
+    if match.group(1) in cmake_vars:
       return cmake_vars[match.group(1)]
     return ""
   return _CMAKE_VAR_REGEX.sub(replace, input_str)

third_party/llvm/llvm.BUILD

@@ -4,6 +4,8 @@
 
 licenses(["notice"])
 
+exports_files(["LICENSE.TXT"])
+
 load(
     "@//third_party/llvm:llvm.bzl",
     "gentbl",
@@ -1664,6 +1666,7 @@ cc_library(
     deps = [
         ":config",
         ":demangle",
+        "@zlib_archive//:zlib",
     ],
 )