[mojo] Add typemap and variant support to generators

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.
 
 # Generate C++/JavaScript/Java 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 (optional if one of the deps sets listed below is present)
 #       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.
 #
 #   import_dirs (optional)
 #       List of import directories that will get added when processing sources.
 #
 #   with_environment (optional)
 #       Set to |false| to omit an implicit bindings dependency on the Chromium
 #       Mojo environment implementation. Defaults to |true| and in general
 #       should only be overridden by mojom targets within the Mojo EDK.
 #
+#   typemaps (optional)

[yzshen1, 2015/12/15 00:09:10]

What about GYP? :) I don't see the corresponding changes in GYP.

+#       A list of typemap files to apply during bindings generation.
+#
+#   variant (optional)
+#       A variant name to apply to generated bindings. Variant influences
+#       generated source filenames as wells the symbols they define.
+#
 #   testonly (optional)
 #
 #   visibility (optional)
 template("mojom") {
   assert(
       defined(invoker.sources) || defined(invoker.deps) ||
           defined(invoker.public_deps),
       "\"sources\" or \"deps\" must be defined for the $target_name template.")
 
   cpp_sources_suffix = "cpp_sources"
@@ skipping 57 matching lines @@
       "$generator_root/pylib/mojom/generate/generator.py",
       "$generator_root/pylib/mojom/generate/module.py",
       "$generator_root/pylib/mojom/generate/pack.py",
       "$generator_root/pylib/mojom/generate/template_expander.py",
       "$generator_root/pylib/mojom/parse/__init__.py",
       "$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_js_outputs =
-        [ "{{source_gen_dir}}/{{source_name_part}}.mojom.js" ]
-    generator_java_outputs =
-        [ "{{source_gen_dir}}/{{source_name_part}}.mojom.srcjar" ]
+    if (defined(invoker.variant)) {
+      variant = invoker.variant
+      generator_cpp_outputs = [
+        "{{source_gen_dir}}/{{source_name_part}}.mojom-${variant}.cc",
+        "{{source_gen_dir}}/{{source_name_part}}.mojom-${variant}.h",
+        "{{source_gen_dir}}/{{source_name_part}}.mojom-${variant}-internal.h",
+      ]
+      generator_js_outputs = []
+      generator_java_outputs = []
+    } else {
+      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_js_outputs =
+          [ "{{source_gen_dir}}/{{source_name_part}}.mojom.js" ]
+      generator_java_outputs =
+          [ "{{source_gen_dir}}/{{source_name_part}}.mojom.srcjar" ]
+    }
   }
 
   if (defined(invoker.sources)) {
     generator_target_name = target_name + "__generator"
     action_foreach(generator_target_name) {
       script = generator_script
       inputs = generator_sources
       sources = invoker.sources
       outputs =
           generator_cpp_outputs + generator_java_outputs + generator_js_outputs
       args = [
         "{{source}}",
         "--use_bundled_pylibs",
         "-d",
         rebase_path("//", root_build_dir),
         "-I",
         rebase_path("//", root_build_dir),
         "-o",
         rebase_path(root_gen_dir),
       ]
 
       if (defined(invoker.import_dirs)) {
         foreach(import_dir, invoker.import_dirs) {
           args += [
             "-I",
             rebase_path(import_dir, root_build_dir),
           ]
         }
       }
+
+      if (defined(invoker.variant)) {
+        args += [
+          "--variant",
+          invoker.variant,
+        ]
+      }
+
+      if (defined(invoker.typemaps)) {
+        foreach(typemap, invoker.typemaps) {
+          args += [
+            "--typemap",
+            rebase_path(typemap, root_build_dir),
+          ]
+        }
+      }
     }
   }
 
   source_set(target_name) {
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
     if (defined(invoker.testonly)) {
       testonly = invoker.testonly
     }
-    if (defined(invoker.sources)) {
+    if (defined(invoker.sources) && !defined(invoker.variant)) {
       data = process_file_template(invoker.sources, generator_js_outputs)
     }
 
     public_deps = [
       "//mojo/public/cpp/bindings",
     ]
     if (defined(invoker.sources)) {
       public_deps += [ ":${cpp_sources_target_name}" ]
     }
     if (defined(invoker.public_deps)) {
@@ skipping 54 matching lines @@
         # get the cpp dependency name.
         full_name = get_label_info(d, "label_no_toolchain")
         deps += [ "${full_name}_${cpp_sources_suffix}" ]
       }
       if (!defined(invoker.with_environment) || invoker.with_environment) {
         deps += [ "//mojo/environment:chromium" ]
       }
     }
   }
 
-  if (is_android) {
+  if (is_android && !defined(invoker.variant)) {
     import("//build/config/android/rules.gni")
 
     java_srcjar_target_name = target_name + "_java_sources"
     action(java_srcjar_target_name) {
       script = "//mojo/public/tools/gn/zip.py"
       inputs = process_file_template(invoker.sources, generator_java_outputs)
       output = "$target_gen_dir/$target_name.srcjar"
       outputs = [
         output,
       ]
@@ skipping 20 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" ]
       }
 
       srcjar_deps = [ ":$java_srcjar_target_name" ]
     }
   }
 }