From c11b5458f81c143a0de6905d32cacd893ad2bcd7 Mon Sep 17 00:00:00 2001
From: Jason Zaman <jason@perfinion.com>
Date: Sun, 14 Oct 2018 13:46:59 +0800
Subject: [PATCH] Revert "Move bazel.rc to workspace root to support
 bazel-0.18.0"

This reverts commit a74a3217f7ff2dbee2fb618aa658cf666861545c.

Bazel-0.18.0 is changing where it searches for .bazelrc files.
Originally it was removing /tools/bazel.rc and only using /.bazelrc.
This causes issues for gitignoring /.bazelrc and 0.18.0 has temporarily
added tools/bazel.rc back to the list until 0.19. The long term solution
is to use try-import but that statement is new in 0.18 and we are not
going to bump TF's minimum right away. When 0.19 is out things will need
to be changed back and the minimum bumped to 0.18.

Fixes: https://github.com/tensorflow/tensorflow/issues/22762
Fixes: https://github.com/tensorflow/tensorflow/pull/22906
Signed-off-by: Jason Zaman <jason@perfinion.com>
---
 .gitignore                 | 1 +
 .bazelrc => tools/bazel.rc | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename .bazelrc => tools/bazel.rc (98%)

diff --git a/.gitignore b/.gitignore
index cb65f447d4a551..1ef4c297ee4f36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 .ipynb_checkpoints
 node_modules
+/.bazelrc
 /.tf_configure.bazelrc
 /bazel-*
 /bazel_pip
diff --git a/.bazelrc b/tools/bazel.rc
similarity index 98%
rename from .bazelrc
rename to tools/bazel.rc
index 1945078789dcd4..cee0b0b064d242 100644
--- a/.bazelrc
+++ b/tools/bazel.rc
@@ -91,5 +91,3 @@ build:dynamic_kernels --define=dynamic_loaded_kernels=true
 build --define=PREFIX=/usr
 build --define=LIBDIR=$(PREFIX)/lib
 build --define=INCLUDEDIR=$(PREFIX)/include
-
-# Do not commit the tf_configure.bazelrc line