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 = [
       ".",
       "include/",
     ]
 
-    defines = [ "GRPC_USE_PROTO_LITE" ]
-  }
-
-  config("grpc_no_cxx11_threads") {
-    # TODO(xyzzyz): the <condition_variable> header in libstdc++-4.6 we're using
-    # in Chromium has a bug, which causes a compilation error on Clang.
-    # Therefore, we need to make gRPC not use standard library threading support.
-    # https://crbug.com/593874
-    defines = [ "GRPC_CXX0X_NO_THREAD" ]
+    defines = [
+      "GRPC_USE_PROTO_LITE",
+      # TODO(xyzzyz): the <condition_variable> header in libstdc++-4.6 we're using
+      # in Chromium has a bug, which causes a compilation error on Clang.
+      # Therefore, we need to make gRPC not use standard library threading support.
+      # https://crbug.com/593874
+      "GRPC_CXX0X_NO_THREAD",
+    ]
   }
 
   <%!
   def get_deps(target_dict):
     deps = []
     if target_dict.get("secure", False):
       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", []):
+      # TODO(xyzzyz): grpc++_unsecure mistakenly depends on both grpc and
+      # grpc_unsecure. See https://github.com/grpc/grpc/issues/7739

[Garrett Casto, 2016/08/15 22:43:17]

Nit: The second sentence here should be something like "Remove once ... is
fixed". Right now there is no action specified for the TODO :).

+      if name == "grpc++_unsecure" and d == "grpc":
+        # Ignore.
+        continue
+
       if d.startswith(("//", ":")):
         deps.append(d)
       else:
         deps.append(":%s" % d)
     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 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")
@@ skipping 21 matching lines @@
   ${cc_binary(tgt)}
   % endif
   % endfor
 
   <%def name="cc_library(lib)">
   <%
     lib_hdrs = lib.get("headers", [])
     hdrs = [h for h in lib_hdrs if not uses_nanopb_or_protofull(h)]
     srcs = [s for s in lib.src if not uses_nanopb_or_protofull(s)]
   %>
-  component("${lib.name}") {
+  source_set("${lib.name}") {
     sources = [
   % for hdr in lib.get("public_headers", []):
       "${hdr}",
   % endfor
   % for hdr in hdrs:
       "${hdr}",
   % endfor
   % for src in srcs:
       "${src}",
   % endfor
     ]
     deps = [
   % for dep in get_deps(lib):
       "${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",
+    ]
   }
   </%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>