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

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

Issue 1029113005: Update mojo sdk to rev cb6c5abfadfea0ca73dca466e2894554ac1ae144 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment Created 5 years, 9 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 5cfd5cd7cbb28d7451b8120b5860ec0a80d86899..dd68501d8601f2aeb78979ec13438b694e2388a0 100644
--- a/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni
+++ b/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni
@@ -334,7 +334,14 @@ template("mojom") {
output,
]
- rebase_base_dir = rebase_path("$root_build_dir/gen/", root_build_dir)
+ invoker_base_dir = ""
+ if (defined(invoker.base_dir)) {
+ invoker_base_dir =
+ rebase_path(invoker.base_dir, "$root_build_dir/../../", ".")
+ }
+
+ rebase_base_dir =
+ rebase_path("$root_build_dir/gen/$invoker_base_dir", root_build_dir)
if (defined(invoker.sources)) {
rebase_inputs = rebase_path(inputs, root_build_dir)
}

Powered by Google App Engine
This is Rietveld 408576698