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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # TODO(vardhan): Targets for each language bindings depend on a central 5 # TODO(vardhan): Targets for each language bindings depend on a central
6 # generator target which generates bindings for /every/ language. Create 6 # generator target which generates bindings for /every/ language. Create
7 # separate generator targets for each language. 7 # separate generator targets for each language.
8 8
9 import("../../mojo_sdk.gni") 9 import("../../mojo_sdk.gni")
10 10
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 visibility = invoker.visibility 294 visibility = invoker.visibility
295 } 295 }
296 if (defined(invoker.testonly)) { 296 if (defined(invoker.testonly)) {
297 testonly = invoker.testonly 297 testonly = invoker.testonly
298 } 298 }
299 299
300 public_configs = 300 public_configs =
301 rebase_path([ "mojo/public/build/config:mojo_sdk" ], ".", mojo_root) 301 rebase_path([ "mojo/public/build/config:mojo_sdk" ], ".", mojo_root)
302 302
303 public_deps = rebase_path([ "mojo/public/c:bindings" ], ".", mojo_root) 303 public_deps = rebase_path([ "mojo/public/c:bindings" ], ".", mojo_root)
304 foreach(d, rebased_mojo_sdk_public_deps) { 304 deps = []
305 full_name = get_label_info(d, "label_no_toolchain") 305 c_public_deps = []
306 public_deps += [ "${full_name}_c" ] 306 c_deps = []
307
308 # Bring in |invoker.public_deps| and |invoker.deps|.
309 if (defined(invoker.public_deps)) {
310 c_public_deps += invoker.public_deps
311 }
312 if (defined(invoker.deps)) {
313 c_deps += invoker.deps
307 } 314 }
308 315
309 deps = [] 316 foreach(d, c_public_deps + rebased_mojo_sdk_public_deps) {
310 foreach(d, rebased_mojo_sdk_deps) {
311 # Resolve the name, so that a target //mojo/something becomes 317 # Resolve the name, so that a target //mojo/something becomes
312 # //mojo/something:something and we can append "_c" to get the C 318 # //mojo/something:something and we can append "_c" to get the C
313 # dependency name. 319 # dependency name.
314 full_name = get_label_info(d, "label_no_toolchain") 320 full_name = get_label_info(d, "label_no_toolchain")
321 public_deps += [ "${full_name}_c" ]
322 }
323 foreach(d, c_deps + rebased_mojo_sdk_deps) {
324 full_name = get_label_info(d, "label_no_toolchain")
315 deps += [ "${full_name}_c" ] 325 deps += [ "${full_name}_c" ]
316 } 326 }
317 327
318 if (defined(invoker.sources)) { 328 if (defined(invoker.sources)) {
319 deps += [ ":$generator_target_name" ] 329 deps += [ ":$generator_target_name" ]
320 sources = process_file_template( 330 sources = process_file_template(
321 invoker.sources, 331 invoker.sources,
322 [ 332 [
323 "{{source_gen_dir}}/{{source_name_part}}.mojom-c.c", 333 "{{source_gen_dir}}/{{source_name_part}}.mojom-c.c",
324 "{{source_gen_dir}}/{{source_name_part}}.mojom-c.h", 334 "{{source_gen_dir}}/{{source_name_part}}.mojom-c.h",
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 # //mojo/something:something and we can append "_java" to get the java 573 # //mojo/something:something and we can append "_java" to get the java
564 # dependency name. 574 # dependency name.
565 full_name = get_label_info(d, "label_no_toolchain") 575 full_name = get_label_info(d, "label_no_toolchain")
566 deps += [ "${full_name}_java" ] 576 deps += [ "${full_name}_java" ]
567 } 577 }
568 578
569 srcjar_deps = [ ":$java_srcjar_target_name" ] 579 srcjar_deps = [ ":$java_srcjar_target_name" ]
570 } 580 }
571 } 581 }
572 } 582 }
OLDNEW
« 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