| Index: mojo/public/tools/bindings/mojom.gni | 
| diff --git a/mojo/public/tools/bindings/mojom.gni b/mojo/public/tools/bindings/mojom.gni | 
| index a30e10ce4380798969f5c788fd127525413974bd..372a7e65ff5e0b405df07ada5cda16301a53911c 100644 | 
| --- a/mojo/public/tools/bindings/mojom.gni | 
| +++ b/mojo/public/tools/bindings/mojom.gni | 
| @@ -47,6 +47,11 @@ foreach(configuration, _bindings_configurations) { | 
| read_file(typemap.mojom, "") | 
| } | 
| } | 
| +  if (is_win && defined(configuration.typemaps_win)) { | 
| +    foreach(typemap, configuration.typemaps_win) { | 
| +      read_file(typemap.mojom, "") | 
| +    } | 
| +  } | 
| } | 
|  | 
| # Generates targets for building C++, JavaScript and Java bindings from mojom | 
| @@ -287,6 +292,13 @@ template("mojom") { | 
| } | 
| } | 
| } | 
| +        if (is_win && defined(bindings_configuration.typemaps_win)) { | 
| +          foreach(typemap, bindings_configuration.typemaps_win) { | 
| +            if (get_path_info(source, "abspath") == typemap.mojom) { | 
| +              active_typemaps += [ typemap ] | 
| +            } | 
| +          } | 
| +        } | 
| } | 
|  | 
| if (!cpp_only) { | 
|  |