Update mojo sdk to rev cb6c5abfadfea0ca73dca466e2894554ac1ae144

third_party/mojo/src/mojo/public/dart/rules.gni

Index: third_party/mojo/src/mojo/public/dart/rules.gni
diff --git a/third_party/mojo/src/mojo/public/dart/rules.gni b/third_party/mojo/src/mojo/public/dart/rules.gni
index 56c502a55591a08a9354c7e72ff575a47545d872..120a738872874f255d73ac7f0199924132fd30d8 100644
--- a/third_party/mojo/src/mojo/public/dart/rules.gni
+++ b/third_party/mojo/src/mojo/public/dart/rules.gni
@@ -35,6 +35,9 @@ template("dart_package") {
 
     rebase_base_dir =
         rebase_path(get_label_info(":$target_name", "dir"), root_build_dir)
+    if (defined(invoker.base_dir)) {
+      rebase_base_dir = invoker.base_dir
+    }
     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)
@@ -74,50 +77,9 @@ template("dart_packaged_application") {
       rebase_path(package_output),
       rebase_path("$target_gen_dir/${target_name}_analyze.stamp"),
       "--no-hints",
-
-      # The dart bindings refer to the autogenerated application interface in
-      # their source code; since that code is then packaged into the image, we
-      # need to manually resolve these package urls to the autogenerated code.
-      "--url-mapping=package:mojo/public/interfaces/application/application.mojom.dart,/" + rebase_path(
-              "mojo/public/interfaces/application/application.mojom.dart",
-              "/",
-              root_gen_dir + mojo_root),
-      "--url-mapping=package:mojo/public/interfaces/application/service_provider.mojom.dart,/" + rebase_path(
-              "mojo/public/interfaces/application/service_provider.mojom.dart",
-              "/",
-              root_gen_dir + mojo_root),
-      "--url-mapping=package:mojo/public/interfaces/application/shell.mojom.dart,/" + rebase_path(
-              "mojo/public/interfaces/application/shell.mojom.dart",
-              "/",
-              root_gen_dir + mojo_root),
-
-      # If you are trying to use the mojo sdk in another repository, you'll
-      # probably also need these url mapping overrides. Users are currently
-      # referring to these files with these third_party/mojo/ URLs.
-      #
-      # (This means that we're referring to the same files through two different
-      # URLs, depending on which part of the system we're referring to them from.
-      # This is not a good idea.)
-      "--url-mapping=package:third_party/mojo/src/mojo/public/interfaces/application/application.mojom.dart,/" + rebase_path(
-              "mojo/public/interfaces/application/application.mojom.dart",
-              "/",
-              root_gen_dir + mojo_root),
-      "--url-mapping=package:third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.dart,/" + rebase_path(
-              "mojo/public/interfaces/application/service_provider.mojom.dart",
-              "/",
-              root_gen_dir + mojo_root),
-      "--url-mapping=package:third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.dart,/" + rebase_path(
-              "mojo/public/interfaces/application/shell.mojom.dart",
-              "/",
-              root_gen_dir + mojo_root),
     ]
 
-    # Because the standard 'mojo:*' packages depend on the application mojom
-    # interface, we must depend on their existence, even though we don't depend
-    # directly on them.
-    deps = [
-      rebase_path("mojo/public/interfaces/application", ".", mojo_root),
-    ]
+    deps = []
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }