Generate Mojom Types in Dart (Take 2)

mojo/dart/embedder/tools/dart_embedder_url_mappings.py

Index: mojo/dart/embedder/tools/dart_embedder_url_mappings.py
diff --git a/mojo/dart/embedder/tools/dart_embedder_url_mappings.py b/mojo/dart/embedder/tools/dart_embedder_url_mappings.py
index 1f351588da83a2f0d70c895be6b1d217d90ca25d..52d298ec4f6c674f79cc51b7718c40cba2b85217 100755
--- a/mojo/dart/embedder/tools/dart_embedder_url_mappings.py
+++ b/mojo/dart/embedder/tools/dart_embedder_url_mappings.py
@@ -24,6 +24,13 @@ def scan(package_root, directory, mapped_to):
     filenames = [f for f in filenames if f.endswith('.mojom')]
     for f in filenames:
       path = os.path.join(mapped_to, f)
+
+      # Note: This is incorrect for the files in the mojo.bindings.types
+      # module. We rectify the embedder url mapping by adding bindings/types.
+      if f.endswith('service_describer.mojom') or \
+        f.endswith('mojom_files.mojom') or f.endswith('mojom_types.mojom'):
+        path = os.path.join(mapped_to, 'bindings/types', f)
+
       # Append .dart.
       path += '.dart'
       print('--url_mapping=dart:_' + path + ',' +