Get rid of references to bazel toolchains and remote_execution, since they are only present on master

pull/13829/head
Alexander Polcyn 7 years ago
parent 0678db7e24
commit 9f01ae0052
  1. 2
      bazel/grpc_build_system.bzl
  2. 11
      bazel/grpc_deps.bzl
  3. 12
      tools/run_tests/sanity/check_bazel_workspace.py

@ -55,8 +55,6 @@ def grpc_cc_library(name, srcs = [], public_hdrs = [], hdrs = [],
name = name,
srcs = srcs,
defines = select({"//:grpc_no_ares": ["GRPC_ARES=0"],
"//conditions:default": [],}) +
select({"//:remote_execution": ["GRPC_PORT_ISOLATED_RUNTIME=1"],
"//conditions:default": [],}),
hdrs = _maybe_update_cc_library_hdrs(hdrs + public_hdrs),
deps = deps + _get_external_deps(external_deps),

@ -116,14 +116,3 @@ def grpc_deps():
strip_prefix = "abseil-cpp-cc4bed2d74f7c8717e31f9579214ab52a9c9c610",
url = "https://github.com/abseil/abseil-cpp/archive/cc4bed2d74f7c8717e31f9579214ab52a9c9c610.tar.gz",
)
if "com_github_bazelbuild_bazeltoolchains" not in native.existing_rules():
native.http_archive(
name = "com_github_bazelbuild_bazeltoolchains",
strip_prefix = "bazel-toolchains-af4681c3d19f063f090222ec3d04108c4e0ca255",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/af4681c3d19f063f090222ec3d04108c4e0ca255.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/archive/af4681c3d19f063f090222ec3d04108c4e0ca255.tar.gz",
],
sha256 = "d58bb2d6c8603f600d522b6104d6192a65339aa26cbba9f11ff5c4b36dedb928",
)

@ -30,8 +30,6 @@ git_hash_pattern = re.compile('[0-9a-f]{40}')
git_submodules = subprocess.check_output('git submodule', shell=True).strip().split('\n')
git_submodule_hashes = {re.search(git_hash_pattern, s).group() for s in git_submodules}
_BAZEL_TOOLCHAINS_DEP_NAME = 'com_github_bazelbuild_bazeltoolchains'
_GRPC_DEP_NAMES = [
'boringssl',
'com_github_madler_zlib',
@ -41,7 +39,6 @@ _GRPC_DEP_NAMES = [
'com_github_google_benchmark',
'com_github_cares_cares',
'com_google_absl',
_BAZEL_TOOLCHAINS_DEP_NAME,
]
@ -66,9 +63,6 @@ class BazelEvalState(object):
return []
def archive(self, **args):
if args['name'] == _BAZEL_TOOLCHAINS_DEP_NAME:
self.names_and_urls[args['name']] = 'dont care'
return
self.names_and_urls[args['name']] = args['url']
@ -88,11 +82,7 @@ for name in _GRPC_DEP_NAMES:
assert name in names_and_urls.keys()
assert len(_GRPC_DEP_NAMES) == len(names_and_urls.keys())
# bazeltoolschains is an exception to this sanity check,
# we don't require that there is a corresponding git module.
names_without_bazeltoolchains = names_and_urls.keys()
names_without_bazeltoolchains.remove(_BAZEL_TOOLCHAINS_DEP_NAME)
archive_urls = [names_and_urls[name] for name in names_without_bazeltoolchains]
archive_urls = [names_and_urls[name] for name in names_and_urls.keys()]
workspace_git_hashes = {
re.search(git_hash_pattern, url).group()
for url in archive_urls

Loading…
Cancel
Save