Update mojo sdk to rev 59145288bae55b0fce4276b017df6a1117bcf00f

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 =
-      rebase_path("mojo/public/tools/bindings", ".", mojo_root)
+  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 49 matching lines @@
     "$generator_root/pylib/mojom/parse/ast.py",
     "$generator_root/pylib/mojom/parse/lexer.py",
     "$generator_root/pylib/mojom/parse/parser.py",
     "$generator_root/pylib/mojom/parse/translate.py",
   ]
   generator_cpp_outputs = [
     "{{source_gen_dir}}/{{source_name_part}}.mojom.cc",
     "{{source_gen_dir}}/{{source_name_part}}.mojom.h",
     "{{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",
-  ]
+  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" ]
 
   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)) {
       visibility = target_visibility + invoker.visibility
     }
     script = generator_script
     inputs = generator_sources
     sources = invoker.sources
-    outputs = generator_cpp_outputs +
-              generator_dart_outputs +
-              generator_java_outputs +
-              generator_js_outputs +
-              generator_python_outputs
+    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),
+      "--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),
     ]
   }
 
   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_configs =
+        rebase_path([ "mojo/public/build/config:mojo_sdk" ], ".", mojo_root)
 
-    public_deps = rebase_path([
-      "mojo/public/cpp/bindings",
-    ], ".", 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",
     ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
@@ skipping 20 matching lines @@
       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 = rebase_path([
-        "mojo/public/java:bindings",
-        "mojo/public/java:system",
-      ], ".", mojo_root)
+                           "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)
     }
   }
 }