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

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

Issue 2237983003: Fix mojom template: C mojom target was not pulling in invoker.deps. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 years, 4 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 | « no previous file | no next file » | 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 8be28aefcf095fa3d794f8bad63fbdd113629e48..c79057ffd6241196ae9db95d1518fad2db985847 100644
--- a/mojo/public/tools/bindings/mojom.gni
+++ b/mojo/public/tools/bindings/mojom.gni
@@ -301,17 +301,27 @@ template("mojom") {
rebase_path([ "mojo/public/build/config:mojo_sdk" ], ".", mojo_root)
public_deps = rebase_path([ "mojo/public/c:bindings" ], ".", mojo_root)
- foreach(d, rebased_mojo_sdk_public_deps) {
- full_name = get_label_info(d, "label_no_toolchain")
- public_deps += [ "${full_name}_c" ]
+ deps = []
+ c_public_deps = []
+ c_deps = []
+
+ # Bring in |invoker.public_deps| and |invoker.deps|.
+ if (defined(invoker.public_deps)) {
+ c_public_deps += invoker.public_deps
+ }
+ if (defined(invoker.deps)) {
+ c_deps += invoker.deps
}
- deps = []
- foreach(d, rebased_mojo_sdk_deps) {
+ foreach(d, c_public_deps + rebased_mojo_sdk_public_deps) {
# Resolve the name, so that a target //mojo/something becomes
# //mojo/something:something and we can append "_c" to get the C
# dependency name.
full_name = get_label_info(d, "label_no_toolchain")
+ public_deps += [ "${full_name}_c" ]
+ }
+ foreach(d, c_deps + rebased_mojo_sdk_deps) {
+ full_name = get_label_info(d, "label_no_toolchain")
deps += [ "${full_name}_c" ]
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698