Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f

third_party/mojo/src/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.
 
 import("../../mojo_sdk.gni")
 
 # Generate C++/JavaScript/Java/Python/Dart/Go source files from mojom files. The
 # output files will go under the generated file directory tree with the same
 # path as each input file.
 #
@@ skipping 67 matching lines @@
       "$generator_root/generators/cpp_templates/validation_macros.tmpl",
       "$generator_root/generators/cpp_templates/wrapper_class_declaration.tmpl",
       "$generator_root/generators/cpp_templates/wrapper_class_definition.tmpl",
       "$generator_root/generators/cpp_templates/wrapper_union_class_declaration.tmpl",
       "$generator_root/generators/cpp_templates/wrapper_union_class_definition.tmpl",
       "$generator_root/generators/dart_templates/enum_definition.tmpl",
       "$generator_root/generators/dart_templates/interface_definition.tmpl",
       "$generator_root/generators/dart_templates/module.lib.tmpl",
       "$generator_root/generators/dart_templates/module_definition.tmpl",
       "$generator_root/generators/dart_templates/struct_definition.tmpl",
+      "$generator_root/generators/go_templates/encoding_macros.tmpl",
       "$generator_root/generators/go_templates/enum.tmpl",
       "$generator_root/generators/go_templates/interface.tmpl",
       "$generator_root/generators/go_templates/source.tmpl",
       "$generator_root/generators/go_templates/struct.tmpl",
+      "$generator_root/generators/go_templates/union.tmpl",
       "$generator_root/generators/java_templates/constant_definition.tmpl",
       "$generator_root/generators/java_templates/constants.java.tmpl",
+      "$generator_root/generators/java_templates/data_types_definition.tmpl",
+      "$generator_root/generators/java_templates/enum_definition.tmpl",
       "$generator_root/generators/java_templates/enum.java.tmpl",
-      "$generator_root/generators/java_templates/enum_definition.tmpl",
       "$generator_root/generators/java_templates/header.java.tmpl",
-      "$generator_root/generators/java_templates/interface.java.tmpl",
       "$generator_root/generators/java_templates/interface_definition.tmpl",
       "$generator_root/generators/java_templates/interface_internal.java.tmpl",
+      "$generator_root/generators/java_templates/interface.java.tmpl",
       "$generator_root/generators/java_templates/struct.java.tmpl",
-      "$generator_root/generators/java_templates/struct_definition.tmpl",
+      "$generator_root/generators/java_templates/union.java.tmpl",
       "$generator_root/generators/js_templates/enum_definition.tmpl",
       "$generator_root/generators/js_templates/interface_definition.tmpl",
       "$generator_root/generators/js_templates/module.amd.tmpl",
       "$generator_root/generators/js_templates/module_definition.tmpl",
       "$generator_root/generators/js_templates/struct_definition.tmpl",
       "$generator_root/generators/python_templates/module.py.tmpl",
       "$generator_root/generators/python_templates/module_macros.tmpl",
       "$generator_root/generators/mojom_cpp_generator.py",
       "$generator_root/generators/mojom_dart_generator.py",
       "$generator_root/generators/mojom_go_generator.py",
@@ skipping 102 matching lines @@
     if (defined(invoker.sources)) {
       public_deps += [ ":${cpp_sources_target_name}" ]
     }
     public_deps += rebased_mojo_sdk_public_deps
     if (defined(invoker.public_deps)) {
       public_deps += invoker.public_deps
     }
 
     deps = []
     if (defined(invoker.sources)) {
-      deps += [ ":$generator_target_name" ]
+      public_deps += [ ":$generator_target_name" ]
     }
     deps += rebased_mojo_sdk_deps
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
     data_deps = [ ":${target_name}_dart" ]
     if (defined(invoker.mojo_sdk_deps)) {
       foreach(sdk_dep, invoker.mojo_sdk_deps) {
         # Check that the SDK dep was not mistakenly given as an absolute path.
         assert(get_path_info(sdk_dep, "abspath") != sdk_dep)
@@ skipping 20 matching lines @@
     foreach(d, all_deps) {
       name = get_label_info(d, "label_no_toolchain")
       toolchain = get_label_info(d, "toolchain")
       deps += [ "${name}__is_mojom(${toolchain})" ]
     }
   }
 
   action("${target_name}_python") {
     script = rebase_path("mojo/public/tools/gn/zip.py", ".", mojo_root)
 
-    if (defined(invoker.sources)) {
-      inputs = process_file_template(invoker.sources, generator_python_outputs)
-    }
-
     deps = []
     zip_inputs = []
 
+    if (defined(invoker.sources)) {
+      inputs = process_file_template(invoker.sources, generator_python_outputs)
+      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 "_python" to get the python
       # dependency name.
       full_name = get_label_info(d, "label_no_toolchain")
       dep_name = get_label_info(d, "name")
       dep_target_out_dir = get_label_info(d, "target_out_dir")
       deps += [ "${full_name}_python" ]
       zip_inputs += [ "$dep_target_out_dir/${dep_name}_python.pyzip" ]
     }
@@ skipping 15 matching lines @@
       "--output=$rebase_output",
     ]
     if (defined(invoker.sources)) {
       args += [ "--inputs=$rebase_inputs" ]
     }
   }
 
   action("${target_name}_dart") {
     script = rebase_path("mojo/public/tools/gn/zip.py", ".", mojo_root)
 
-    if (defined(invoker.sources)) {
-      inputs = process_file_template(invoker.sources, generator_dart_outputs)
-    }
-
     deps = []
     zip_inputs = []
 
+    if (defined(invoker.sources)) {
+      inputs = process_file_template(invoker.sources, generator_dart_outputs)
+      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 "_dart" to get the dart
       # dependency name.
       full_name = get_label_info(d, "label_no_toolchain")
       dep_name = get_label_info(d, "name")
       dep_target_out_dir = get_label_info(d, "target_out_dir")
       deps += [ "${full_name}_dart" ]
       zip_inputs += [ "$dep_target_out_dir/$dep_name.dartzip" ]
     }
@@ skipping 83 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" ]
     }
   }
 }