Move more special cases in bazel build to the .bzl files

BUILD

@@ -417,14 +417,13 @@ grpc_cc_library(
         "src/core/ext/census/grpc_context.cc",
     ],
     external_deps = [
-        "libssl",
+        "nanopb",
     ],
     language = "c++",
     public_hdrs = [
         "include/grpc/census.h",
     ],
     deps = [
-        "//third_party/nanopb",
         "grpc_base",
     ],
 )
@@ -1010,9 +1009,11 @@ grpc_cc_library(
         "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h",
         "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h",
     ],
+    external_deps = [
+        "nanopb",
+    ],
     language = "c++",
     deps = [
-        "//third_party/nanopb",
         "grpc_base",
         "grpc_client_channel",
         "grpc_resolver_fake",
@@ -1037,9 +1038,11 @@ grpc_cc_library(
         "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h",
         "src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h",
     ],
+    external_deps = [
+        "nanopb",
+    ],
     language = "c++",
     deps = [
-        "//third_party/nanopb",
         "grpc_base",
         "grpc_client_channel",
         "grpc_resolver_fake",
@@ -1388,7 +1391,7 @@ grpc_cc_library(
     ],
     hdrs = [
         "src/core/ext/transport/cronet/transport/cronet_transport.h",
-        "//third_party:objective_c/Cronet/bidirectional_stream_c.h",
+        "third_party/objective_c/Cronet/bidirectional_stream_c.h",
     ],
     language = "c++",
     public_hdrs = [

bazel/grpc_build_system.bzl

@@ -23,6 +23,27 @@
 # each change must be ported from one to the other.
 #
 
+def _get_external_deps(external_deps):
+  ret = []
+  for dep in external_deps:
+    if dep == "nanopb":
+      ret.append("//third_party/nanopb")
+    else:
+      ret.append("//external:" + dep)
+  return ret
+
+def _maybe_update_cc_library_hdrs(hdrs):
+  ret = []
+  hdrs_to_update = {
+      "third_party/objective_c/Cronet/bidirectional_stream_c.h": "//third_party:objective_c/Cronet/bidirectional_stream_c.h",
+  }
+  for h in hdrs:
+    if h in hdrs_to_update.keys():
+      ret.append(hdrs_to_update[h])
+    else:
+      ret.append(h)
+  return ret
+
 def grpc_cc_library(name, srcs = [], public_hdrs = [], hdrs = [],
                     external_deps = [], deps = [], standalone = False,
                     language = "C++", testonly = False, visibility = None,
@@ -33,12 +54,12 @@ def grpc_cc_library(name, srcs = [], public_hdrs = [], hdrs = [],
   native.cc_library(
     name = name,
     srcs = srcs,
-    defines = select({
-        "//:grpc_no_ares": ["GRPC_ARES=0"],
-	"//conditions:default": [],
-    }),
-    hdrs = hdrs + public_hdrs,
-    deps = deps + ["//external:" + dep for dep in external_deps],
+    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),
     copts = copts,
     visibility = visibility,
     testonly = testonly,
@@ -79,7 +100,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data
     srcs = srcs,
     args = args,
     data = data,
-    deps = deps + ["//external:" + dep for dep in external_deps],
+    deps = deps + _get_external_deps(external_deps),
     copts = copts,
     linkopts = ["-pthread"],
   )
@@ -95,7 +116,7 @@ def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], da
     data = data,
     testonly = testonly,
     linkshared = linkshared,
-    deps = deps + ["//external:" + dep for dep in external_deps],
+    deps = deps + _get_external_deps(external_deps),
     copts = copts,
     linkopts = ["-pthread"] + linkopts,
   )

bazel/grpc_deps.bzl

@@ -1,9 +1,7 @@
-def grpc_deps():
-    native.bind(
-        name = "nanopb",
-        actual = "@com_github_grpc_grpc//third_party/nanopb",
-    )
+"""Load dependencies needed to compile and test the grpc library as a 3rd-party consumer."""
 
+def grpc_deps():
+    """Loads dependencies need to compile and test the grpc library."""
     native.bind(
         name = "libssl",
         actual = "@boringssl//:ssl",
@@ -59,12 +57,14 @@ def grpc_deps():
         actual = "@com_github_gflags_gflags//:gflags",
     )
 
+    if "boringssl" not in native.existing_rules():
         native.http_archive(
             name = "boringssl",
             # on the master-with-bazel branch
             url = "https://boringssl.googlesource.com/boringssl/+archive/886e7d75368e3f4fab3f4d0d3584e4abfc557755.tar.gz",
         )
 
+    if "com_github_madler_zlib" not in native.existing_rules():
         native.new_http_archive(
             name = "com_github_madler_zlib",
             build_file = "@com_github_grpc_grpc//third_party:zlib.BUILD",
@@ -72,12 +72,14 @@ def grpc_deps():
             url = "https://github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz",
         )
 
+    if "com_google_protobuf" not in native.existing_rules():
         native.http_archive(
             name = "com_google_protobuf",
-        strip_prefix = "protobuf-80a37e0782d2d702d52234b62dd4b9ec74fd2c95",
-        url = "https://github.com/google/protobuf/archive/80a37e0782d2d702d52234b62dd4b9ec74fd2c95.tar.gz",
+            strip_prefix = "protobuf-2761122b810fe8861004ae785cc3ab39f384d342",
+            url = "https://github.com/google/protobuf/archive/2761122b810fe8861004ae785cc3ab39f384d342.tar.gz",
         )
 
+    if "com_github_google_googletest" not in native.existing_rules():
         native.new_http_archive(
             name = "com_github_google_googletest",
             build_file = "@com_github_grpc_grpc//third_party:gtest.BUILD",
@@ -85,12 +87,14 @@ def grpc_deps():
             url = "https://github.com/google/googletest/archive/ec44c6c1675c25b9827aacd08c02433cccde7780.tar.gz",
         )
 
+    if "com_github_gflags_gflags" not in native.existing_rules():
         native.http_archive(
             name = "com_github_gflags_gflags",
             strip_prefix = "gflags-30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e",
             url = "https://github.com/gflags/gflags/archive/30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e.tar.gz",
         )
 
+    if "com_github_google_benchmark" not in native.existing_rules():
         native.new_http_archive(
             name = "com_github_google_benchmark",
             build_file = "@com_github_grpc_grpc//third_party:benchmark.BUILD",
@@ -98,6 +102,7 @@ def grpc_deps():
             url = "https://github.com/google/benchmark/archive/5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8.tar.gz",
         )
 
+    if "com_github_cares_cares" not in native.existing_rules():
         native.new_http_archive(
             name = "com_github_cares_cares",
             build_file = "@com_github_grpc_grpc//third_party:cares/cares.BUILD",
@@ -105,8 +110,20 @@ def grpc_deps():
             url = "https://github.com/c-ares/c-ares/archive/3be1924221e1326df520f8498d704a5c4c8d0cce.tar.gz",
         )
 
+    if "com_google_absl" not in native.existing_rules():
         native.http_archive(
             name = "com_google_absl",
             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",
+        )

tools/run_tests/sanity/check_bazel_workspace.py

@@ -30,13 +30,76 @@ 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}
 
-# Parse git hashes from Bazel WORKSPACE {new_}http_archive rules
-with open('WORKSPACE', 'r') as f:
-  workspace_rules = [expr.value for expr in ast.parse(f.read()).body]
+_BAZEL_TOOLCHAINS_DEP_NAME = 'com_github_bazelbuild_bazeltoolchains'
 
-http_archive_rules = [rule for rule in workspace_rules if rule.func.id.endswith('http_archive')]
-archive_urls = [kw.value.s for rule in http_archive_rules for kw in rule.keywords if kw.arg == 'url']
-workspace_git_hashes = {re.search(git_hash_pattern, url).group() for url in archive_urls}
+_GRPC_DEP_NAMES = [
+    'boringssl',
+    'com_github_madler_zlib',
+    'com_google_protobuf',
+    'com_github_google_googletest',
+    'com_github_gflags_gflags',
+    'com_github_google_benchmark',
+    'com_github_cares_cares',
+    'com_google_absl',
+    _BAZEL_TOOLCHAINS_DEP_NAME,
+]
+
+
+class BazelEvalState(object):
+
+    def __init__(self, names_and_urls, overridden_name=None):
+        self.names_and_urls = names_and_urls
+        self.overridden_name = overridden_name
+
+    def http_archive(self, **args):
+        self.archive(**args)
+
+    def new_http_archive(self, **args):
+        self.archive(**args)
+
+    def bind(self, **args):
+        pass
+
+    def existing_rules(self):
+        if self.overridden_name:
+            return [self.overridden_name]
+        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']
+
+
+# Parse git hashes from bazel/grpc_deps.bzl {new_}http_archive rules
+with open(os.path.join('bazel', 'grpc_deps.bzl'), 'r') as f:
+    names_and_urls = {}
+    eval_state = BazelEvalState(names_and_urls)
+    bazel_file = f.read()
+
+# grpc_deps.bzl only defines 'grpc_deps', add this to call it
+bazel_file += '\ngrpc_deps()\n'
+build_rules = {
+    'native': eval_state,
+}
+exec bazel_file in build_rules
+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]
+workspace_git_hashes = {
+    re.search(git_hash_pattern, url).group()
+    for url in archive_urls
+}
+if len(workspace_git_hashes) == 0:
+    print("(Likely) parse error, did not find any bazel git dependencies.")
+    sys.exit(1)
 
 # Validate the equivalence of the git submodules and Bazel git dependencies. The
 # condition we impose is that there is a git submodule for every dependency in
@@ -46,4 +109,15 @@ if len(workspace_git_hashes - git_submodule_hashes) > 0:
     print("Found discrepancies between git submodules and Bazel WORKSPACE dependencies")
     sys.exit(1)
 
+# Also check that we can override each dependency
+for name in _GRPC_DEP_NAMES:
+    names_and_urls_with_overridden_name = {}
+    state = BazelEvalState(
+        names_and_urls_with_overridden_name, overridden_name=name)
+    rules = {
+        'native': state,
+    }
+    exec bazel_file in rules
+    assert name not in names_and_urls_with_overridden_name.keys()
+
 sys.exit(0)