Uses mojom module names as Dart's package: import URI

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++ and JavaScript 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 163 matching lines @@
         visibility = target_visibility + invoker.visibility
       }
       script = generator_script
       inputs = generator_sources
       sources = invoker.sources
       outputs = generator_cpp_outputs + generator_dart_outputs +
                 generator_go_outputs + generator_java_outputs +
                 generator_js_outputs + generator_python_outputs
       args = [
         "{{source}}",
-        "--dart_mojo_root=${mojo_root}",
         "--use_bundled_pylibs",
         "-d",
         rebase_path("//", root_build_dir),
         "-I",
         rebase_path("//", root_build_dir),
         "-I",
         rebase_path(mojo_root, root_build_dir),
         "-o",
         rebase_path(root_gen_dir),
       ]
@@ skipping 134 matching lines @@
       dep_target_out_dir = get_label_info(d, "target_out_dir")
       deps += [ "${full_name}_dart" ]
       zip_inputs += [ "$dep_target_out_dir/$dep_name.dartzip" ]
     }
 
     output = generator_dart_zip_output
     outputs = [
       output,
     ]
 
-    invoker_import_from = ""
-    if (defined(invoker.import_from)) {
-      invoker_import_from =
-          rebase_path(invoker.import_from, "$root_build_dir/../../", ".")
-    }
-
     rebase_import_from =
-        rebase_path("$root_build_dir/gen/$invoker_import_from", root_build_dir)
+        rebase_path("$root_build_dir/gen/dart-gen", root_build_dir)
     if (defined(invoker.sources)) {
       rebase_inputs = rebase_path(inputs, root_build_dir)
     }
     rebase_zip_inputs = rebase_path(zip_inputs, root_build_dir)
     rebase_output = rebase_path(output, root_build_dir)
     args = [
       "--base-dir=$rebase_import_from",
       "--zip-inputs=$rebase_zip_inputs",
       "--output=$rebase_output",
     ]
     if (defined(invoker.sources)) {
-      args += [ "--inputs=$rebase_inputs" ]
+      args += [ "--link-inputs=$rebase_inputs" ]
     }
   }
 
   if (is_android) {
     import("//build/config/android/rules.gni")
 
     java_target_name = target_name + "_java"
     android_library(java_target_name) {
       deps = rebase_path([
                            "mojo/public/java:bindings",
                            "mojo/public/java:system",
                          ],
                          ".",
                          mojo_root)
 
       foreach(d, all_deps) {
         # Resolve the name, so that a target //mojo/something becomes
         # //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" ]
       }
 
       if (defined(invoker.sources)) {
         srcjars = process_file_template(invoker.sources, generator_java_outputs)
       }
     }
   }
 }