mojom GNI: Implicit variant inheritance for deps

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 384 matching lines @@
       }
       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)) {
-        public_deps += invoker.deps
+        foreach(dep, invoker.deps) {
+          public_deps +=
+              [ get_label_info(dep, "label_no_toolchain") + variant_suffix ]
+        }
       }
       if (defined(invoker.public_deps)) {
-        public_deps += 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
@@ skipping 101 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
       }
     }
   }
 }