Move third_party/mojo/src/mojo/public to mojo/public

mojo/public/tools/bindings/mojom.gni

Index: mojo/public/tools/bindings/mojom.gni
diff --git a/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni b/mojo/public/tools/bindings/mojom.gni
similarity index 93%
rename from third_party/mojo/src/mojo/public/tools/bindings/mojom.gni
rename to mojo/public/tools/bindings/mojom.gni
index 9ef3198d89d65314244f934fc6e346ee908a732e..7143ef87d87e7673ae137c1aa5cc5e73d38575e7 100644
--- a/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni
+++ b/mojo/public/tools/bindings/mojom.gni
@@ -56,7 +56,7 @@ template("mojom") {
   cpp_sources_suffix = "cpp_sources"
   cpp_sources_target_name = "${target_name}_${cpp_sources_suffix}"
   if (defined(invoker.sources)) {
-    generator_root = rebase_path("mojo/public/tools/bindings", ".", mojo_root)
+    generator_root = "//mojo/public/tools/bindings"
     generator_script = "$generator_root/mojom_bindings_generator.py"
     generator_sources = [
       generator_script,
@@ -137,7 +137,7 @@ template("mojom") {
     foreach(sdk_dep, invoker.mojo_sdk_public_deps) {
       # Check that the SDK dep was not mistakenly given as an absolute path.
       assert(get_path_info(sdk_dep, "abspath") != sdk_dep)
-      rebased_mojo_sdk_public_deps += [ rebase_path(sdk_dep, ".", mojo_root) ]
+      rebased_mojo_sdk_public_deps += [ rebase_path(sdk_dep, ".", "//") ]
     }
   }
 
@@ -146,7 +146,7 @@ template("mojom") {
     foreach(sdk_dep, invoker.mojo_sdk_deps) {
       # Check that the SDK dep was not mistakenly given as an absolute path.
       assert(get_path_info(sdk_dep, "abspath") != sdk_dep)
-      rebased_mojo_sdk_deps += [ rebase_path(sdk_dep, ".", mojo_root) ]
+      rebased_mojo_sdk_deps += [ rebase_path(sdk_dep, ".", "//") ]
     }
   }
 
@@ -165,8 +165,6 @@ template("mojom") {
         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),
       ]
@@ -193,7 +191,9 @@ template("mojom") {
       data = process_file_template(invoker.sources, generator_js_outputs)
     }
 
-    public_deps = rebase_path([ "mojo/public/cpp/bindings" ], ".", mojo_root)
+    public_deps = [
+      "//mojo/public/cpp/bindings",
+    ]
     if (defined(invoker.sources)) {
       public_deps += [ ":${cpp_sources_target_name}" ]
     }
@@ -214,7 +214,7 @@ template("mojom") {
       foreach(sdk_dep, invoker.mojo_sdk_deps) {
         # Check that the SDK dep was not mistakenly given as an absolute path.
         assert(get_path_info(sdk_dep, "abspath") != sdk_dep)
-        deps += [ rebase_path(sdk_dep, ".", mojo_root) ]
+        deps += [ rebase_path(sdk_dep, ".", "//") ]
       }
     }
   }
@@ -256,9 +256,7 @@ template("mojom") {
       deps = [
         ":$generator_target_name",
         "//base",
-        rebase_path("mojo/public/interfaces/bindings:bindings__generator",
-                    ".",
-                    mojo_root),
+        "//mojo/public/interfaces/bindings:bindings__generator",
       ]
       foreach(d, all_deps) {
         # Resolve the name, so that a target //mojo/something becomes
@@ -278,7 +276,7 @@ template("mojom") {
 
     java_srcjar_target_name = target_name + "_java_sources"
     action(java_srcjar_target_name) {
-      script = rebase_path("mojo/public/tools/gn/zip.py", ".", mojo_root)
+      script = "//mojo/public/tools/gn/zip.py"
       inputs = process_file_template(invoker.sources, generator_java_outputs)
       output = "$target_gen_dir/$target_name.srcjar"
       outputs = [
@@ -297,12 +295,10 @@ template("mojom") {
 
     java_target_name = target_name + "_java"
     android_library(java_target_name) {
-      deps = rebase_path([
-                           "mojo/public/java:bindings",
-                           "mojo/public/java:system",
-                         ],
-                         ".",
-                         mojo_root)
+      deps = [
+        "//mojo/public/java:bindings",
+        "//mojo/public/java:system",
+      ]
 
       foreach(d, all_deps) {
         # Resolve the name, so that a target //mojo/something becomes