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

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

Issue 1071693003: Uses mojom module names as Dart's package: import URI (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Merge Created 5 years, 8 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
« no previous file with comments | « mojo/public/tools/bindings/generators/mojom_dart_generator.py ('k') | mojo/public/tools/gn/zip.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/tools/bindings/mojom.gni
diff --git a/mojo/public/tools/bindings/mojom.gni b/mojo/public/tools/bindings/mojom.gni
index 6c03ea6a35e23385fc3b01a50a688dfc73d930c5..3ad86250f623a9e4e619a7ab74c4c948ce22cf90 100644
--- a/mojo/public/tools/bindings/mojom.gni
+++ b/mojo/public/tools/bindings/mojom.gni
@@ -181,7 +181,6 @@ template("mojom") {
generator_js_outputs + generator_python_outputs
args = [
"{{source}}",
- "--dart_mojo_root=${mojo_root}",
"--use_bundled_pylibs",
"-d",
rebase_path("//", root_build_dir),
@@ -336,14 +335,8 @@ template("mojom") {
output,
]
- invoker_import_from = ""
- if (defined(invoker.import_from)) {
- invoker_import_from =
- rebase_path(invoker.import_from, "$root_build_dir/../../", ".")
- }
-
rebase_import_from =
- rebase_path("$root_build_dir/gen/$invoker_import_from", root_build_dir)
+ rebase_path("$root_build_dir/gen/dart-gen", root_build_dir)
if (defined(invoker.sources)) {
rebase_inputs = rebase_path(inputs, root_build_dir)
}
@@ -355,7 +348,7 @@ template("mojom") {
"--output=$rebase_output",
]
if (defined(invoker.sources)) {
- args += [ "--inputs=$rebase_inputs" ]
+ args += [ "--link-inputs=$rebase_inputs" ]
}
}
« no previous file with comments | « mojo/public/tools/bindings/generators/mojom_dart_generator.py ('k') | mojo/public/tools/gn/zip.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698