diff options
| -rw-r--r-- | .bazelrc (renamed from tools/bazel.rc) | 2 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.py | 7 | ||||
| -rwxr-xr-x | tensorflow/tools/ci_build/builds/android.sh | 1 |
4 files changed, 4 insertions, 7 deletions
diff --git a/tools/bazel.rc b/.bazelrc index 3734fab715..d5d20309df 100644 --- a/tools/bazel.rc +++ b/.bazelrc @@ -84,3 +84,5 @@ 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 diff --git a/.gitignore b/.gitignore index 1ef4c297ee..cb65f447d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .DS_Store .ipynb_checkpoints node_modules -/.bazelrc /.tf_configure.bazelrc /bazel-* /bazel_pip diff --git a/configure.py b/configure.py index 7e47175b98..2d2da11700 100644 --- a/configure.py +++ b/configure.py @@ -260,12 +260,7 @@ def reset_tf_configure_bazelrc(): if _TF_BAZELRC_FILENAME in l: continue f.write('%s\n' % l) - if is_windows(): - tf_bazelrc_path = _TF_BAZELRC.replace('\\', '/') - else: - tf_bazelrc_path = _TF_BAZELRC - f.write('import %s\n' % tf_bazelrc_path) - + f.write('import %%workspace%%/%s\n' % _TF_BAZELRC_FILENAME) def cleanup_makefile(): """Delete any leftover BUILD files from the Makefile build. diff --git a/tensorflow/tools/ci_build/builds/android.sh b/tensorflow/tools/ci_build/builds/android.sh index 7c3e308229..ec5ec9993a 100755 --- a/tensorflow/tools/ci_build/builds/android.sh +++ b/tensorflow/tools/ci_build/builds/android.sh @@ -38,6 +38,7 @@ TARGETS+=" //tensorflow/core/common_runtime/eager:execute" bazel --bazelrc=/dev/null build \ --compilation_mode=opt --cxxopt=-std=c++11 --fat_apk_cpu=x86_64 \ --spawn_strategy=sandboxed --genrule_strategy=sandboxed \ + --define=grpc_no_ares=true \ ${TARGETS} echo "========== Makefile Build Test ==========" |