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

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

Issue 799113004: Update mojo sdk to rev 59145288bae55b0fce4276b017df6a1117bcf00f (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add mojo's ply to checklicenses whitelist Created 6 years 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: mojo/public/tools/bindings/mojom.gni
diff --git a/mojo/public/tools/bindings/mojom.gni b/mojo/public/tools/bindings/mojom.gni
index d7c83d6f3279eeeed5d910262f1c1b25f34c8336..45ad58f64e19e1dc03b218fc79cb6b8fa3e2e8ff 100644
--- a/mojo/public/tools/bindings/mojom.gni
+++ b/mojo/public/tools/bindings/mojom.gni
@@ -26,8 +26,7 @@ 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,
@@ -97,18 +96,13 @@ template("mojom") {
"{{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
@@ -125,18 +119,20 @@ template("mojom") {
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),
]
}
@@ -150,13 +146,10 @@ template("mojom") {
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
}
@@ -197,9 +190,11 @@ template("mojom") {
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
« no previous file with comments | « mojo/public/tools/bindings/generators/mojom_js_generator.py ('k') | mojo/public/tools/bindings/mojom_bindings_generator.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698