Revert "Support tf tf repo macros in external repos."

WORKSPACE

@@ -13,6 +13,7 @@ http_archive(
     ],
     patch_tool = "patch",
     patches = [
+        "//tf_patches:bazel.diff",
         "//tf_patches:cache_urls.diff",
         "//tf_patches:cudnn_int8x32.diff",
         "//tf_patches:f16_abi_clang.diff",

tf_patches/bazel.diff

@@ -0,0 +1,13 @@
+diff --git i/tensorflow/tensorflow.bzl w/tensorflow/tensorflow.bzl
+index 649c8e22dcc..a85f4bc3af3 100644
+--- i/tensorflow/tensorflow.bzl
++++ w/tensorflow/tensorflow.bzl
+@@ -315,7 +315,7 @@ def if_libtpu(if_true, if_false = []):
+ def if_with_tpu_support(if_true, if_false = []):
+     """Shorthand for select()ing whether to build API support for TPUs when building TensorFlow"""
+     return select({
+-        "//tensorflow:with_tpu_support": if_true,
++        clean_dep("//tensorflow:with_tpu_support"): if_true,
+         "//conditions:default": if_false,
+     })
+

third_party/xla_client/BUILD

@@ -1,5 +1,6 @@
 load(
     "@org_tensorflow//tensorflow:tensorflow.bzl",
+    "if_with_tpu_support",
     "tf_cc_shared_object",
 )
 load(
@@ -10,10 +11,6 @@ load(
     "@org_tensorflow//tensorflow/tsl/platform/default:cuda_build_defs.bzl",
     "if_cuda_is_configured",
 )
-load(
-    "//bazel:tensorflow.bzl",
-    "if_with_tpu_support",
-)
 
 licenses(["notice"])  # Apache 2.0