diff --git a/go/private/repositories.bzl b/go/private/repositories.bzl
index acc68a1124..ded0714cca 100644
--- a/go/private/repositories.bzl
+++ b/go/private/repositories.bzl
@@ -136,7 +136,7 @@ def go_rules_dependencies():
         commit = "8dea3dc473e90c8179e519d91302d0597c0ca1d1",  # v1.15.0, latest as of 2018-09-28
         patches = [
             "@io_bazel_rules_go//third_party:org_golang_google_grpc-gazelle.patch",
-            "@io_bazel_rules_go//third_party:org_golang_google_grpc-android.patch",
+            "@io_bazel_rules_go//third_party:org_golang_google_grpc-crosscompile.patch",
         ],
         patch_args = ["-p1"],
         # gazelle args: -go_prefix google.golang.org/grpc -proto disable
diff --git a/third_party/org_golang_google_grpc-android.patch b/third_party/org_golang_google_grpc-crosscompile.patch
similarity index 76%
rename from third_party/org_golang_google_grpc-android.patch
rename to third_party/org_golang_google_grpc-crosscompile.patch
index 2abda07935..ca28e4344d 100644
--- a/third_party/org_golang_google_grpc-android.patch
+++ b/third_party/org_golang_google_grpc-crosscompile.patch
@@ -1,17 +1,23 @@
 diff -urN b/internal/channelz/BUILD.bazel c/internal/channelz/BUILD.bazel
 --- b/internal/channelz/BUILD.bazel	2018-09-27 16:55:16.110787059 -0400
 +++ c/internal/channelz/BUILD.bazel	2018-09-27 16:55:54.851285539 -0400
-@@ -17,6 +17,9 @@
+@@ -17,6 +17,15 @@
          "//credentials:go_default_library",
          "//grpclog:go_default_library",
      ] + select({
++        "@io_bazel_rules_go//go/platform:darwin": [
++            "@org_golang_x_sys//unix:go_default_library",
++        ],
++        "@io_bazel_rules_go//go/platform:windows": [
++            "@org_golang_x_sys//unix:go_default_library",
++        ],
 +        "@io_bazel_rules_go//go/platform:android": [
 +            "@org_golang_x_sys//unix:go_default_library",
 +        ],
          "@io_bazel_rules_go//go/platform:linux": [
              "@org_golang_x_sys//unix:go_default_library",
          ],
-@@ -29,6 +32,9 @@
+@@ -29,6 +38,9 @@
      srcs = ["util_test.go"],
      embed = [":go_default_library"],
      deps = select({