Mojo C++ bindings: extract code shared by different variants.

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 216 matching lines @@
       generator_cpp_outputs = []
       generator_js_outputs = []
       generator_java_outputs = []
       variant_dash_suffix = ""
       if (defined(variant)) {
         variant_dash_suffix = "-${variant}"
       }
       generator_cpp_outputs += [
         "{{source_gen_dir}}/{{source_name_part}}.mojom${variant_dash_suffix}.cc",
         "{{source_gen_dir}}/{{source_name_part}}.mojom${variant_dash_suffix}.h",
-        "{{source_gen_dir}}/{{source_name_part}}.mojom${variant_dash_suffix}-internal.h",
       ]
       enabled_sources = []
       if (defined(bindings_configuration.blacklist)) {
         foreach(source, invoker.sources) {
           blacklisted = false
           foreach(blacklisted_source, bindings_configuration.blacklist) {
             if (get_path_info(source, "abspath") == blacklisted_source) {
               blacklisted = true
             }
           }
@@ skipping 181 matching lines @@
       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 = [
-        ":$shared_cpp_sources_target_name",
         "//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",
       ]
       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
         # get the cpp dependency name.
         full_name = get_label_info("$d", "label_no_toolchain")
         public_deps += [ "${full_name}${variant_suffix}_${cpp_sources_suffix}" ]
       }
       foreach(typemap, active_typemaps) {
@@ skipping 63 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
       }
     }
   }
 }