Update mojo sdk to rev 9fbbc4f0fef1187312316c0ed992342474e139f1

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.
 #
+# If a mojom target is intended for use in a client repo where the location of
+# the Mojo SDK will be different than its location in the Mojo repo,
+# dependencies on the SDK should be specified relative to the parent directory
+# of the Mojo public SDK in |mojo_sdk_deps| rather than via absolute paths in
+# |deps|.
+#
 # Parameters:
 #
 #   sources (required)
 #       List of source .mojom files to compile.
 #
 #   deps (optional)
 #       Note: this can contain only other mojom targets.
 #
+#   mojo_sdk_deps (optional)
+#       List of deps specified relative to the parent directory of the Mojo
+#       public SDK. These deps will be added as ordinary deps rebased to the
+#       current directory.
+#
 #   public_deps (optional)
 #       Note: this can contain only other mojom targets.
 #
+#   mojo_sdk_public_deps (optional)
+#       List of public deps specified relative to the parent directory of the
+#       Mojo public SDK. These deps will be added as ordinary public deps
+#       rebased to the current directory.
+#
 #   testonly (optional)
 #
 #   visibility (optional)
 template("mojom") {
   assert(defined(invoker.sources),
          "\"sources\" must be defined for the $target_name template.")
 
   generator_root = rebase_path("mojo/public/tools/bindings", ".", mojo_root)
   generator_script = "$generator_root/mojom_bindings_generator.py"
   generator_sources = [
@@ skipping 65 matching lines @@
     "{{source_gen_dir}}/{{source_name_part}}.mojom-internal.h",
   ]
   generator_dart_outputs =
       [ "{{source_gen_dir}}/{{source_name_part}}.mojom.dart" ]
   generator_java_outputs =
       [ "{{source_gen_dir}}/{{source_name_part}}.mojom.srcjar" ]
   generator_js_outputs = [ "{{source_gen_dir}}/{{source_name_part}}.mojom.js" ]
   generator_python_outputs =
       [ "{{source_gen_dir}}/{{source_name_part}}_mojom.py" ]
 
+  rebased_mojo_sdk_public_deps = []
+  if (defined(invoker.mojo_sdk_public_deps)) {
+    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_deps = []
+  if (defined(invoker.mojo_sdk_deps)) {
+    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) ]
+    }
+  }
+
   if (defined(invoker.visibility)) {
     # Need to save this because the the target_name is overwritten inside the
     # action to be that of the action itself. Only define this in the case the
     # var is used to avoid unused var error.
     target_visibility = [ ":$target_name" ]
   }
 
   generator_target_name = target_name + "__generator"
   action_foreach(generator_target_name) {
     if (defined(invoker.visibility)) {
@@ skipping 26 matching lines @@
     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)
+    public_deps += rebased_mojo_sdk_public_deps
     if (defined(invoker.public_deps)) {
       public_deps += invoker.public_deps
     }
 
     deps = [
       ":$generator_target_name",
     ]
+    deps += rebased_mojo_sdk_deps
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
   }
 
-  all_deps = []
+  all_deps = rebased_mojo_sdk_deps + rebased_mojo_sdk_public_deps
   if (defined(invoker.deps)) {
     all_deps += invoker.deps
   }
   if (defined(invoker.public_deps)) {
     all_deps += invoker.public_deps
   }
 
   group("${target_name}__is_mojom") {
   }
 
@@ skipping 25 matching lines @@
         # //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)
     }
   }
 }