Enable gRPC fuzz targets and re-enable courgette_fuzzer.

Bug: 584819,933836
Change-Id: Iff16b29d5436eee441e41ed5bf7b417c07ccba6a
Reviewed-on: https://chromium-review.googlesource.com/c/1478993
Reviewed-by: Nico Weber <[email protected]>
Reviewed-by: John Budorick <[email protected]>
Reviewed-by: Yuwei Huang <[email protected]>
Commit-Queue: Max Moroz <[email protected]>
Cr-Commit-Position: refs/heads/master@{#633962}
diff --git a/BUILD.gn b/BUILD.gn
index 99b74571..b708c27a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -724,6 +724,7 @@
       (is_win && (use_drfuzz || use_libfuzzer)) || (use_libfuzzer && is_mac)) {
     deps += [
       "//testing/libfuzzer/fuzzers",
+      "//third_party/grpc:fuzzers",
       "//third_party/icu/fuzzers",
       "//third_party/qcms:fuzzers",
       "//third_party/zlib/contrib/tests/fuzzers",
diff --git a/testing/libfuzzer/fuzzers/BUILD.gn b/testing/libfuzzer/fuzzers/BUILD.gn
index f4f9ce2..b3787a47 100644
--- a/testing/libfuzzer/fuzzers/BUILD.gn
+++ b/testing/libfuzzer/fuzzers/BUILD.gn
@@ -27,7 +27,6 @@
     "//base",
     "//courgette:courgette_lib",
   ]
-  additional_configs = [ "//testing/libfuzzer:no_clusterfuzz" ]
 }
 
 fuzzer_test("language_detection_fuzzer") {
diff --git a/third_party/grpc/BUILD.gn b/third_party/grpc/BUILD.gn
index 0ff0399..5465627 100644
--- a/third_party/grpc/BUILD.gn
+++ b/third_party/grpc/BUILD.gn
@@ -548,6 +548,10 @@
   ]
 }
 
+# A dummy group which is needed to make the fuzz targets discoverable.
+group("fuzzers") {
+}
+
 fuzzer_test("grpc_alts_credentials_fuzzer") {
   sources = [
     "src/test/core/security/alts_credentials_fuzzer.cc",