Update BUILD.gn template

templates/BUILD.gn.template

Index: templates/BUILD.gn.template
diff --git a/templates/BUILD.gn.template b/templates/BUILD.gn.template
index 46865d2617805637636726e896cf7794f52cfcc5..0e886f7631c3aa1f2119cc154db0245830fa3b69 100644
--- a/templates/BUILD.gn.template
+++ b/templates/BUILD.gn.template
@@ -36,7 +36,7 @@
     name = target_dict.get("name", None)
     if name in ("grpc++_unsecure", "grpc++", "grpc++_codegen_lib"):
       deps.append("//third_party/protobuf:protobuf_lite")
-    elif name == "grpc":
+    elif name in ("grpc", "grpc_unsecure"):
       deps.append("//third_party/zlib")
 
     for d in target_dict.get("deps", []):
@@ -47,12 +47,15 @@
     return deps
 
   def get_extra_configs(target_dict):
-    if target_dict.get("name", "") in ("grpc++", "grpc++_unsecure"):
-      return [":grpc_no_cxx11_threads"]
     if target_dict.get("name", "") == "grpc_cpp_plugin":
       return ["//third_party/protobuf:protobuf_config"]
     return []
 
+  def get_extra_public_configs(target_dict):
+    if target_dict.get("name", "") in ("grpc++", "grpc++_unsecure"):
+      return [":grpc_no_cxx11_threads"]
+    return []
+
   def uses_nanopb_or_protofull(f):
     return (f.startswith("third_party/nanopb")
       or f.endswith(".pb.h")
@@ -114,7 +117,12 @@
       "${config}",
   % endfor
     ]
-    public_configs = [ ":grpc_config" ]
+    public_configs = [
+      ":grpc_config",
+  % for config in get_extra_public_configs(lib):
+      "${config}",
+  % endfor
+    ]
   }
   </%def>