Mojo Bindings: Put typemap files in the build dependency tree

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 22 matching lines @@
   _bindings_configuration_files =
       [ "//mojo/public/tools/bindings/chromium_bindings_configuration.gni" ]
 }
 _bindings_configurations = []
 foreach(config_file, _bindings_configuration_files) {
   _bindings_configurations += [ read_file(config_file, "scope") ]
 }
 foreach(configuration, _bindings_configurations) {
   # Check that the mojom field of each typemap refers to a mojom that exists.
   foreach(typemap, configuration.typemaps) {
-    read_file(typemap.mojom, "")
+    _typemap_config = {
+    }
+    _typemap_config = typemap.config
+    read_file(_typemap_config.mojom, "")
   }
   if (is_mac && defined(configuration.typemaps_mac)) {
     foreach(typemap, configuration.typemaps_mac) {
-      read_file(typemap.mojom, "")
+      _typemap_config = {
+      }
+      _typemap_config = typemap.config
+      read_file(_typemap_config.mojom, "")
     }
   }
 }
 
 # Generates targets for building C++, JavaScript and Java bindings from mojom
 # files. The output files will go under the generated file directory tree with
 # the same path as each input file.
 #
 # Other targets should depend on one of these generated targets (where "foo"
 # is the target name):
@@ skipping 235 matching lines @@
           if (!blacklisted) {
             enabled_sources += [ source ]
           }
         }
       } else {
         enabled_sources = invoker.sources
       }
       foreach(source, enabled_sources) {
         # TODO(sammc): Use a map instead of a linear scan when GN supports maps.
         foreach(typemap, bindings_configuration.typemaps) {
-          if (get_path_info(source, "abspath") == typemap.mojom) {
+          _typemap_config = {
+          }
+          _typemap_config = typemap.config
+          if (get_path_info(source, "abspath") == _typemap_config.mojom) {
             active_typemaps += [ typemap ]
           }
         }
         if (is_mac && defined(bindings_configuration.typemaps_mac)) {
           foreach(typemap, bindings_configuration.typemaps_mac) {
-            if (get_path_info(source, "abspath") == typemap.mojom) {
+            _typemap_config = {
+            }
+            _typemap_config = typemap.config
+            if (get_path_info(source, "abspath") == _typemap_config.mojom) {
               active_typemaps += [ typemap ]
             }
           }
         }
       }
 
       if (!cpp_only) {
         generator_js_outputs =
             [ "{{source_gen_dir}}/{{source_name_part}}.mojom.js" ]
         generator_java_outputs =
@@ skipping 92 matching lines @@
           "--dependency",
           dependency_path,
         ]
       }
 
       if (enabled_sources != []) {
         # TODO(sammc): Pass the typemap description in a file to avoid command
         # line length limitations.
         typemap_description = []
         foreach(typemap, active_typemaps) {
+          _typemap_config = {
+          }
+          _typemap_config = typemap.config
           typemap_description += [ "--start-typemap" ]
-          if (defined(typemap.public_headers)) {
-            foreach(value, typemap.public_headers) {
+          if (defined(_typemap_config.public_headers)) {
+            foreach(value, _typemap_config.public_headers) {
               typemap_description += [ "public_headers=$value" ]
             }
           }
-          if (defined(typemap.traits_headers)) {
-            foreach(value, typemap.traits_headers) {
+          if (defined(_typemap_config.traits_headers)) {
+            foreach(value, _typemap_config.traits_headers) {
               typemap_description += [ "traits_headers=$value" ]
             }
           }
-          foreach(value, typemap.type_mappings) {
+          foreach(value, _typemap_config.type_mappings) {
             typemap_description += [ "type_mappings=$value" ]
           }
+
+          # The typemap configuration files are not actually used as inputs here
+          # but this establishes a necessary build dependency to ensure that
+          # typemap changes force a rebuild of affected targets.
+          inputs += [ typemap.filename ]
         }
         args += typemap_description
       }
     }
 
     source_set("${target_name}${variant_suffix}") {
       if (defined(bindings_configuration.for_blink) &&
           bindings_configuration.for_blink &&
           defined(invoker.visibility_blink)) {
         visibility = invoker.visibility_blink
@@ skipping 57 matching lines @@
             # Resolve the name, so that a target //mojo/something becomes
             # //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}" ]
           }
           public_deps += invoker.component_deps
         }
       }
       foreach(typemap, active_typemaps) {
-        if (defined(typemap.public_headers)) {
-          sources += typemap.public_headers
+        _typemap_config = {
         }
-        if (defined(typemap.traits_headers)) {
-          sources += typemap.traits_headers
+        _typemap_config = typemap.config
+        if (defined(_typemap_config.public_headers)) {
+          sources += _typemap_config.public_headers
         }
-        if (defined(typemap.sources)) {
-          sources += typemap.sources
+        if (defined(_typemap_config.traits_headers)) {
+          sources += _typemap_config.traits_headers
         }
-        if (defined(typemap.public_deps)) {
-          public_deps += typemap.public_deps
+        if (defined(_typemap_config.sources)) {
+          sources += _typemap_config.sources
         }
-        if (defined(typemap.deps)) {
-          deps += typemap.deps
+        if (defined(_typemap_config.public_deps)) {
+          public_deps += _typemap_config.public_deps
+        }
+        if (defined(_typemap_config.deps)) {
+          deps += _typemap_config.deps
         }
       }
       if (defined(bindings_configuration.for_blink) &&
           bindings_configuration.for_blink) {
         public_deps += [ "//mojo/public/cpp/bindings:wtf_support" ]
       }
     }
 
     if (!cpp_only && is_android) {
       import("//build/config/android/rules.gni")
@@ skipping 39 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
       }
     }
   }
 }