Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: third_party/mojo/src/mojo/public/tools/bindings/mojom.gni

Issue 1142043005: Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix type conversion errors on win64 for some msvs Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/mojo/src/mojo/public/tools/bindings/mojom.gni
diff --git a/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni b/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni
index 51c28de250bac03220ad8683f95a0184300e791b..aad33c72cdc71dc2f9ab2205166a12b4fa03e683 100644
--- a/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni
+++ b/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni
@@ -85,20 +85,23 @@ template("mojom") {
"$generator_root/generators/dart_templates/module.lib.tmpl",
"$generator_root/generators/dart_templates/module_definition.tmpl",
"$generator_root/generators/dart_templates/struct_definition.tmpl",
+ "$generator_root/generators/go_templates/encoding_macros.tmpl",
"$generator_root/generators/go_templates/enum.tmpl",
"$generator_root/generators/go_templates/interface.tmpl",
"$generator_root/generators/go_templates/source.tmpl",
"$generator_root/generators/go_templates/struct.tmpl",
+ "$generator_root/generators/go_templates/union.tmpl",
"$generator_root/generators/java_templates/constant_definition.tmpl",
"$generator_root/generators/java_templates/constants.java.tmpl",
- "$generator_root/generators/java_templates/enum.java.tmpl",
+ "$generator_root/generators/java_templates/data_types_definition.tmpl",
"$generator_root/generators/java_templates/enum_definition.tmpl",
+ "$generator_root/generators/java_templates/enum.java.tmpl",
"$generator_root/generators/java_templates/header.java.tmpl",
- "$generator_root/generators/java_templates/interface.java.tmpl",
"$generator_root/generators/java_templates/interface_definition.tmpl",
"$generator_root/generators/java_templates/interface_internal.java.tmpl",
+ "$generator_root/generators/java_templates/interface.java.tmpl",
"$generator_root/generators/java_templates/struct.java.tmpl",
- "$generator_root/generators/java_templates/struct_definition.tmpl",
+ "$generator_root/generators/java_templates/union.java.tmpl",
"$generator_root/generators/js_templates/enum_definition.tmpl",
"$generator_root/generators/js_templates/interface_definition.tmpl",
"$generator_root/generators/js_templates/module.amd.tmpl",
@@ -221,7 +224,7 @@ template("mojom") {
deps = []
if (defined(invoker.sources)) {
- deps += [ ":$generator_target_name" ]
+ public_deps += [ ":$generator_target_name" ]
}
deps += rebased_mojo_sdk_deps
if (defined(invoker.deps)) {
@@ -262,13 +265,14 @@ template("mojom") {
action("${target_name}_python") {
script = rebase_path("mojo/public/tools/gn/zip.py", ".", mojo_root)
+ deps = []
+ zip_inputs = []
+
if (defined(invoker.sources)) {
inputs = process_file_template(invoker.sources, generator_python_outputs)
+ deps += [ ":$generator_target_name" ]
}
- deps = []
- zip_inputs = []
-
foreach(d, all_deps) {
# Resolve the name, so that a target //mojo/something becomes
# //mojo/something:something and we can append "_python" to get the python
@@ -304,13 +308,14 @@ template("mojom") {
action("${target_name}_dart") {
script = rebase_path("mojo/public/tools/gn/zip.py", ".", mojo_root)
+ deps = []
+ zip_inputs = []
+
if (defined(invoker.sources)) {
inputs = process_file_template(invoker.sources, generator_dart_outputs)
+ deps += [ ":$generator_target_name" ]
}
- deps = []
- zip_inputs = []
-
foreach(d, all_deps) {
# Resolve the name, so that a target //mojo/something becomes
# //mojo/something:something and we can append "_dart" to get the dart

Powered by Google App Engine
This is Rietveld 408576698