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

Side by Side Diff: testing/test.gni

Issue 1943583002: GN: forward_variables_from shouldn't clobber vars. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 # ============================================================================== 5 # ==============================================================================
6 # TEST SETUP 6 # TEST SETUP
7 # ============================================================================== 7 # ==============================================================================
8 8
9 template("_gen_isolate") { 9 template("_gen_isolate") {
10 testonly = true 10 testonly = true
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 if (_generate_device_isolate) { 90 if (_generate_device_isolate) {
91 _allow_odd_runtime_deps = defined(invoker.allow_odd_runtime_deps) && 91 _allow_odd_runtime_deps = defined(invoker.allow_odd_runtime_deps) &&
92 invoker.allow_odd_runtime_deps 92 invoker.allow_odd_runtime_deps
93 93
94 # The device isolate is needed at runtime, so it cannot go in 94 # The device isolate is needed at runtime, so it cannot go in
95 # target_gen_dir, as builder/tester configurations do not include it. 95 # target_gen_dir, as builder/tester configurations do not include it.
96 _target_dir_name = get_label_info(":$target_name", "dir") 96 _target_dir_name = get_label_info(":$target_name", "dir")
97 _device_isolate_path = "$root_out_dir/gen.runtime/$_target_dir_name/$targe t_name.device.isolate" 97 _device_isolate_path = "$root_out_dir/gen.runtime/$_target_dir_name/$targe t_name.device.isolate"
98 _gen_isolate_target_name = "${target_name}__isolate" 98 _gen_isolate_target_name = "${target_name}__isolate"
99 _gen_isolate(_gen_isolate_target_name) { 99 _gen_isolate(_gen_isolate_target_name) {
100 data_deps = []
101 forward_variables_from(invoker, 100 forward_variables_from(invoker,
102 [ 101 [
103 "data", 102 "data",
104 "data_deps", 103 "data_deps",
105 "deps", 104 "deps",
106 "public_deps", 105 "public_deps",
107 ]) 106 ])
108 assert_no_odd_data = !_allow_odd_runtime_deps 107 assert_no_odd_data = !_allow_odd_runtime_deps
109 output = _device_isolate_path 108 output = _device_isolate_path
110 apply_device_filters = true 109 apply_device_filters = true
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 if (defined(invoker.output_name) && target_name != invoker.output_name) { 341 if (defined(invoker.output_name) && target_name != invoker.output_name) {
343 group("${invoker.output_name}_run") { 342 group("${invoker.output_name}_run") {
344 testonly = true 343 testonly = true
345 deps = [ 344 deps = [
346 ":${invoker.target_name}", 345 ":${invoker.target_name}",
347 ] 346 ]
348 } 347 }
349 } 348 }
350 } 349 }
351 } 350 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698