Mojo bindings: Fix typemap includes.

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 191 matching lines @@
   }
 
   all_deps = []
   if (defined(invoker.deps)) {
     all_deps += invoker.deps
   }
   if (defined(invoker.public_deps)) {
     all_deps += invoker.public_deps
   }
 
-  group("${target_name}__is_mojom") {
+  if (defined(invoker.variant)) {
+    variant_suffix = "of_variant_${invoker.variant}"
+  } else {
+    variant_suffix = "of_no_variant"
+  }
+  group("${target_name}__is_mojom_${variant_suffix}") {
   }
 
   # Explicitly ensure that all dependencies (invoker.deps and
-  # invoker.public_deps) are mojom targets themselves.
-  group("${target_name}__check_deps_are_all_mojom") {
+  # invoker.public_deps) are mojom targets of the same variant themselves.
+  group("${target_name}__check_deps_are_all_mojom_${variant_suffix}") {
     deps = []
     foreach(d, all_deps) {
       name = get_label_info(d, "label_no_toolchain")
       toolchain = get_label_info(d, "toolchain")
-      deps += [ "${name}__is_mojom(${toolchain})" ]
+      deps += [ "${name}__is_mojom_${variant_suffix}(${toolchain})" ]
     }
   }
 
   if (defined(invoker.sources)) {
     # 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) {
       if (defined(invoker.testonly)) {
         testonly = invoker.testonly
       }
       sources = process_file_template(invoker.sources, generator_cpp_outputs)
+
       deps = [
         ":$generator_target_name",
         "//mojo/public/interfaces/bindings:bindings__generator",
       ]
       public_deps = [
         "//base",
       ]
-      if (defined(invoker.typemap_deps)) {
-        public_deps += invoker.typemap_deps
-      }
       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")
         deps += [ "${full_name}_${cpp_sources_suffix}" ]
       }
       if (defined(invoker.for_blink) && invoker.for_blink) {
         public_deps += [ "//mojo/public/cpp/bindings:wtf_support" ]
       }
@@ skipping 35 matching lines @@
         # //mojo/something:something and we can append "_java" to get the java
         # dependency name.
         full_name = get_label_info(d, "label_no_toolchain")
         deps += [ "${full_name}_java" ]
       }
 
       srcjar_deps = [ ":$java_srcjar_target_name" ]
     }
   }
 }