Index: mojo/public/tools/bindings/mojom.gni |
diff --git a/mojo/public/tools/bindings/mojom.gni b/mojo/public/tools/bindings/mojom.gni |
index be36cb49d6200e1ea6742b1bceeb4a5bcbd6aba6..d8302ec6f5b914e67b0bb626f9ca882a99deb93d 100644 |
--- a/mojo/public/tools/bindings/mojom.gni |
+++ b/mojo/public/tools/bindings/mojom.gni |
@@ -39,10 +39,15 @@ 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) { |
- # Check that the mojom field of each typemap refers to a mojom that exists. |
read_file(typemap.mojom, "") |
} |
+ if (is_mac && defined(configuration.typemaps_mac)) { |
+ foreach(typemap, configuration.typemaps_mac) { |
+ read_file(typemap.mojom, "") |
+ } |
+ } |
} |
# Generate C++/JavaScript/Java source files from mojom files. The output files |
@@ -258,6 +263,13 @@ template("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) { |
+ active_typemaps += [ typemap ] |
+ } |
+ } |
+ } |
} |
if (!cpp_only) { |