From dc5a8e52d7004e3796feaadb0a0b0960f7289884 Mon Sep 17 00:00:00 2001
From: Adin Scannell <ascannell@google.com>
Date: Mon, 10 Feb 2020 15:43:36 -0800
Subject: [PATCH] Rename build to builddefs and minor build clean-up.

The name 'bazel' also doesn't work because bazel will treat it specially.

Fixes #1807

PiperOrigin-RevId: 294321221
---
 tools/{build => bazeldefs}/BUILD    | 0
 tools/{build => bazeldefs}/defs.bzl | 4 ++--
 tools/{build => bazeldefs}/tags.bzl | 0
 tools/defs.bzl                      | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename tools/{build => bazeldefs}/BUILD (100%)
 rename tools/{build => bazeldefs}/defs.bzl (96%)
 rename tools/{build => bazeldefs}/tags.bzl (100%)

diff --git a/tools/build/BUILD b/tools/bazeldefs/BUILD
similarity index 100%
rename from tools/build/BUILD
rename to tools/bazeldefs/BUILD
diff --git a/tools/build/defs.bzl b/tools/bazeldefs/defs.bzl
similarity index 96%
rename from tools/build/defs.bzl
rename to tools/bazeldefs/defs.bzl
index 1a1a0d825..08c29ff1c 100644
--- a/tools/build/defs.bzl
+++ b/tools/bazeldefs/defs.bzl
@@ -8,7 +8,7 @@ load("@rules_pkg//:pkg.bzl", _pkg_deb = "pkg_deb", _pkg_tar = "pkg_tar")
 load("@io_bazel_rules_docker//go:image.bzl", _go_image = "go_image")
 load("@io_bazel_rules_docker//container:container.bzl", _container_image = "container_image")
 load("@pydeps//:requirements.bzl", _py_requirement = "requirement")
-load("//tools/build:tags.bzl", _go_suffixes = "go_suffixes")
+load("//tools/bazeldefs:tags.bzl", _go_suffixes = "go_suffixes")
 
 container_image = _container_image
 cc_binary = _cc_binary
@@ -21,7 +21,7 @@ go_image = _go_image
 go_embed_data = _go_embed_data
 go_suffixes = _go_suffixes
 gtest = "@com_google_googletest//:gtest"
-loopback = "//tools/build:loopback"
+loopback = "//tools/bazeldefs:loopback"
 proto_library = native.proto_library
 pkg_deb = _pkg_deb
 pkg_tar = _pkg_tar
diff --git a/tools/build/tags.bzl b/tools/bazeldefs/tags.bzl
similarity index 100%
rename from tools/build/tags.bzl
rename to tools/bazeldefs/tags.bzl
diff --git a/tools/defs.bzl b/tools/defs.bzl
index c03b557ae..d4690cc1a 100644
--- a/tools/defs.bzl
+++ b/tools/defs.bzl
@@ -7,7 +7,7 @@ change for Google-internal and bazel-compatible rules.
 
 load("//tools/go_stateify:defs.bzl", "go_stateify")
 load("//tools/go_marshal:defs.bzl", "go_marshal", "marshal_deps", "marshal_test_deps")
-load("//tools/build:defs.bzl", "go_suffixes", _cc_binary = "cc_binary", _cc_flags_supplier = "cc_flags_supplier", _cc_library = "cc_library", _cc_proto_library = "cc_proto_library", _cc_test = "cc_test", _cc_toolchain = "cc_toolchain", _container_image = "container_image", _default_installer = "default_installer", _default_net_util = "default_net_util", _go_binary = "go_binary", _go_embed_data = "go_embed_data", _go_image = "go_image", _go_library = "go_library", _go_proto_library = "go_proto_library", _go_test = "go_test", _go_tool_library = "go_tool_library", _gtest = "gtest", _loopback = "loopback", _pkg_deb = "pkg_deb", _pkg_tar = "pkg_tar", _proto_library = "proto_library", _py_binary = "py_binary", _py_library = "py_library", _py_requirement = "py_requirement", _py_test = "py_test", _select_arch = "select_arch", _select_system = "select_system")
+load("//tools/bazeldefs:defs.bzl", "go_suffixes", _cc_binary = "cc_binary", _cc_flags_supplier = "cc_flags_supplier", _cc_library = "cc_library", _cc_proto_library = "cc_proto_library", _cc_test = "cc_test", _cc_toolchain = "cc_toolchain", _container_image = "container_image", _default_installer = "default_installer", _default_net_util = "default_net_util", _go_binary = "go_binary", _go_embed_data = "go_embed_data", _go_image = "go_image", _go_library = "go_library", _go_proto_library = "go_proto_library", _go_test = "go_test", _go_tool_library = "go_tool_library", _gtest = "gtest", _loopback = "loopback", _pkg_deb = "pkg_deb", _pkg_tar = "pkg_tar", _proto_library = "proto_library", _py_binary = "py_binary", _py_library = "py_library", _py_requirement = "py_requirement", _py_test = "py_test", _select_arch = "select_arch", _select_system = "select_system")
 
 # Delegate directly.
 cc_binary = _cc_binary