Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2

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.
 #
 # Parameters:
 #
 #   sources (required)
 #       List of source .mojom files to compile.
 #
 #   deps (optional)
 #       Note: this can contain only other mojom targets.
 #
 #   public_deps (optional)
 #       Note: this can contain only other mojom targets.
 #
 #   testonly (optional)
 #
 #   visibility (optional)
 template("mojom") {
   assert(defined(invoker.sources),
          "\"sources\" must be defined for the $target_name template.")
 
-  generator_root = "//mojo/public/tools/bindings"
+  generator_root =
+      rebase_path("mojo/public/tools/bindings", ".", mojo_root)
   generator_script = "$generator_root/mojom_bindings_generator.py"
   generator_sources = [
     generator_script,
     "$generator_root/generators/cpp_templates/enum_declaration.tmpl",
     "$generator_root/generators/cpp_templates/interface_declaration.tmpl",
     "$generator_root/generators/cpp_templates/interface_definition.tmpl",
     "$generator_root/generators/cpp_templates/interface_macros.tmpl",
     "$generator_root/generators/cpp_templates/interface_proxy_declaration.tmpl",
     "$generator_root/generators/cpp_templates/interface_request_validator_declaration.tmpl",
     "$generator_root/generators/cpp_templates/interface_response_validator_declaration.tmpl",
@@ skipping 87 matching lines @@
     outputs = generator_cpp_outputs +
               generator_dart_outputs +
               generator_java_outputs +
               generator_js_outputs +
               generator_python_outputs
     args = [
       "{{source}}",
       "--use_chromium_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),
     ]
   }
 
   source_set(target_name) {
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
     if (defined(invoker.testonly)) {
       testonly = invoker.testonly
     }
     sources = process_file_template(invoker.sources, generator_cpp_outputs)
     data = process_file_template(invoker.sources, generator_js_outputs)
+
+    public_configs = rebase_path([
+      "mojo/public/build/config:mojo_sdk",
+    ], ".", mojo_root)
+
+    public_deps = rebase_path([
+      "mojo/public/cpp/bindings",
+    ], ".", mojo_root)
+    if (defined(invoker.public_deps)) {
+      public_deps += invoker.public_deps
+    }
+
     deps = [
       ":$generator_target_name",
-      "//mojo/public/cpp/bindings",
     ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
-    if (defined(invoker.public_deps)) {
-      public_deps = invoker.public_deps
-    }
   }
 
   all_deps = []
   if (defined(invoker.deps)) {
     all_deps += invoker.deps
   }
   if (defined(invoker.public_deps)) {
     all_deps += invoker.public_deps
   }
 
   group("${target_name}__is_mojom") {
   }
 
   # Explicitly ensure that all dependencies (invoker.deps and
   # invoker.public_deps) are mojom targets themselves.
   group("${target_name}__check_deps_are_all_mojom") {
     deps = []
     foreach(d, all_deps) {
       name = get_label_info(d, "label_no_toolchain")
       toolchain = get_label_info(d, "toolchain")
       deps += [ "${name}__is_mojom(${toolchain})" ]
     }
   }
 
   if (is_android) {
     import("//build/config/android/rules.gni")
 
     java_target_name = target_name + "_java"
     android_library(java_target_name) {
-      deps = [
-        "//mojo/public/java:bindings",
-        "//mojo/public/java:system",
-      ]
+      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" ]
       }
 
       srcjars = process_file_template(invoker.sources, generator_java_outputs)
     }
   }
 }