Remove the _cpp_sources target from mojom.

mojo/public/tools/bindings/mojom.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 mojom_generator_root = "//mojo/public/tools/bindings"
 mojom_generator_script = "$mojom_generator_root/mojom_bindings_generator.py"
 mojom_generator_sources = [
   "$mojom_generator_root/generators/mojom_cpp_generator.py",
   "$mojom_generator_root/generators/mojom_js_generator.py",
   "$mojom_generator_root/generators/mojom_java_generator.py",
@@ skipping 223 matching lines @@
     variant_suffix = ""
     if (defined(bindings_configuration.variant)) {
       variant = bindings_configuration.variant
       variant_suffix = "_${variant}"
       cpp_only = true
     }
     type_mappings_target_name = "${target_name}${variant_suffix}__type_mappings"
     type_mappings_path =
         "$target_gen_dir/${target_name}${variant_suffix}__type_mappings"
     active_typemaps = []
-    cpp_sources_suffix = "cpp_sources"
-    cpp_sources_target_name =
-        "${target_name}${variant_suffix}_${cpp_sources_suffix}"
     enabled_sources = []
     if (defined(invoker.sources)) {
       generator_cpp_outputs = []
       generator_js_outputs = []
       generator_java_outputs = []
       variant_dash_suffix = ""
       if (defined(variant)) {
         variant_dash_suffix = "-${variant}"
       }
       generator_cpp_outputs += [
@@ skipping 160 matching lines @@
     source_set("${target_name}${variant_suffix}") {
       if (defined(invoker.visibility)) {
         visibility = invoker.visibility
       }
       if (defined(invoker.testonly)) {
         testonly = invoker.testonly
       }
       if (defined(invoker.sources) && !defined(bindings_configuration.variant)) {
         data = process_file_template(enabled_sources, generator_js_outputs)
       }
-
-      public_deps = [
-        ":${cpp_sources_target_name}",
-        "//mojo/public/cpp/bindings",
-      ]
-      if (defined(invoker.deps)) {
-        foreach(dep, invoker.deps) {
-          public_deps +=
-              [ get_label_info(dep, "label_no_toolchain") + variant_suffix ]
-        }
-      }
-      if (defined(invoker.public_deps)) {
-        foreach(dep, invoker.public_deps) {
-          public_deps +=
-              [ get_label_info(dep, "label_no_toolchain") + variant_suffix ]
-        }
-      }
-
-      deps = []
-      if (defined(invoker.sources)) {
-        public_deps += [ ":$generator_target_name" ]
-      }
-    }
-
-    # The generated C++ source files. The main reason to introduce this target
-    # is so that mojo/public/cpp/bindings can depend on mojom interfaces without
-    # circular dependencies. It means that the target is missing the dependency
-    # on mojo/public/cpp/bindings. No external targets should depend directly on
-    # this target *except* mojo/public/cpp/bindings and other *_cpp_sources
-    # targets.
-    source_set(cpp_sources_target_name) {
       defines = []
       if (defined(invoker.testonly)) {
         testonly = invoker.testonly
       }
       if (defined(invoker.export_define)) {
         defines += [ invoker.export_define ]
       }
       if (defined(invoker.export_define_blink)) {
         defines += [ invoker.export_define_blink ]
       }
       if (enabled_sources != []) {
         sources = process_file_template(enabled_sources, generator_cpp_outputs)
       }
       deps = [
         "//mojo/public/cpp/bindings:struct_traits",
         "//mojo/public/interfaces/bindings:bindings__generator",
         "//mojo/public/interfaces/bindings:bindings_shared__generator",
       ]
-      if (enabled_sources != []) {
-        deps += [ ":$generator_target_name" ]
-      }
       public_deps = [
         ":$shared_cpp_sources_target_name",
         "//base",
+        "//mojo/public/cpp/bindings",
       ]
+      if (enabled_sources != []) {
+        public_deps += [ ":$generator_target_name" ]
+      }
       foreach(d, all_deps) {
         # Resolve the name, so that a target //mojo/something becomes
-        # //mojo/something:something and we can append cpp_sources_suffix to
+        # //mojo/something:something and we can append variant_suffix to
         # get the cpp dependency name.
         full_name = get_label_info("$d", "label_no_toolchain")
-        public_deps += [ "${full_name}${variant_suffix}_${cpp_sources_suffix}" ]
+        public_deps += [ "${full_name}${variant_suffix}" ]
       }
       foreach(typemap, active_typemaps) {
         if (defined(typemap.public_headers)) {
           sources += typemap.public_headers
         }
         if (defined(typemap.traits_headers)) {
           sources += typemap.traits_headers
         }
         if (defined(typemap.sources)) {
           sources += typemap.sources
@@ skipping 55 matching lines @@
           full_name = get_label_info(d, "label_no_toolchain")
           deps += [ "${full_name}_java" ]
         }
 
         srcjar_deps = [ ":$java_srcjar_target_name" ]
         run_findbugs_override = false
       }
     }
   }
 }