Update BUILD.gn template

templates/BUILD.gn.template

 %YAML 1.2
 --- |
   # GRPC Chromium BUILD.gn file.
   # This file has been automatically generated from a template file.
   # Please look at the templates directory instead.
   # This file can be regenerated from the template by running
   # tools/buildgen/generate_projects.sh
   config("grpc_config") {
     include_dirs = [
       ".",
@@ skipping 18 matching lines @@
       deps = [
         "//third_party/boringssl",
       ]
 
     if target_dict.get("build", None) == "protoc":
       deps.append("//third_party/protobuf:protoc_lib")
 
     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", []):
       if d.startswith(("//", ":")):
         deps.append(d)
       else:
         deps.append(":%s" % d)
     return deps
 
   def get_extra_configs(target_dict):
+    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"]
-    if target_dict.get("name", "") == "grpc_cpp_plugin":
-      return ["//third_party/protobuf:protobuf_config"]
     return []
 
   def uses_nanopb_or_protofull(f):
     return (f.startswith("third_party/nanopb")
       or f.endswith(".pb.h")
       or f.endswith(".pb.c")
       or f.endswith(".pb.cc")
       or f.endswith("load_balancer_api.h")
       or f.endswith("load_balancer_api.c"))
 
@@ skipping 43 matching lines @@
       "${dep}",
   % endfor
     ]
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [
       "//build/config/compiler:no_chromium_code",
   % for config in get_extra_configs(lib):
       "${config}",
   % endfor
     ]
-    public_configs = [ ":grpc_config" ]
+    public_configs = [
+      ":grpc_config",
+  % for config in get_extra_public_configs(lib):
+      "${config}",
+  % endfor
+    ]
   }
   </%def>
 
   <%def name="cc_binary(tgt)">
   executable("${tgt.name}") {
     sources = [
   % for src in tgt.src:
       "${src}",
   % endfor
     ]
     deps = [
   % for dep in get_deps(tgt):
       "${dep}",
   % endfor
     ]
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [
       "//build/config/compiler:no_chromium_code",
   % for config in get_extra_configs(tgt):
       "${config}",
   % endfor
     ]
     public_configs = [ ":grpc_config" ]
   }
   </%def>