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

Side by Side Diff: testing/test.gni

Issue 1280983003: Forward "include_dirs" to executable target in "ios_app" template. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix-ios-release
Patch Set: Move the forward_variables_from to the correct target Created 5 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 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 # Define a test as an executable (or apk on Android) with the "testonly" flag 9 # Define a test as an executable (or apk on Android) with the "testonly" flag
10 # set. 10 # set.
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 if (defined(invoker.sources)) { 114 if (defined(invoker.sources)) {
115 source_set(target__sources_name) { 115 source_set(target__sources_name) {
116 sources = invoker.sources 116 sources = invoker.sources
117 testonly = true 117 testonly = true
118 118
119 configs = [] # Prevent list overwriting warning. 119 configs = [] # Prevent list overwriting warning.
120 configs += invoker.configs 120 configs += invoker.configs
121 121
122 forward_variables_from(invoker, 122 forward_variables_from(invoker,
123 [ 123 [
124 "cflags",
125 "cflags_c",
126 "cflags_cc",
127 "cflags_objc",
128 "cflags_objcc",
124 "data", 129 "data",
125 "deps",
126 "data_deps", 130 "data_deps",
127 "datadeps", 131 "datadeps",
128 "defines", 132 "defines",
133 "deps",
134 "include_dirs",
129 "includes", 135 "includes",
130 ]) 136 ])
131 } 137 }
132 } 138 }
133 139
134 ios_app(target_name) { 140 ios_app(target_name) {
135 # TODO(GYP): Make this configurable and only provide a default 141 # TODO(GYP): Make this configurable and only provide a default
136 # that can be overridden. 142 # that can be overridden.
137 info_plist = "//testing/gtest_ios/unittest-Info.plist" 143 info_plist = "//testing/gtest_ios/unittest-Info.plist"
138 app_name = target_name 144 app_name = target_name
139 entitlements_path = "//testing/gtest_ios" 145 entitlements_path = "//testing/gtest_ios"
140 code_signing_identity = "" 146 code_signing_identity = ""
141 testonly = true 147 testonly = true
142 148
143 # See above call. 149 # See above call.
144 set_sources_assignment_filter([]) 150 set_sources_assignment_filter([])
145 151
146 forward_variables_from(invoker, 152 forward_variables_from(invoker,
147 [ 153 [
148 "all_dependent_configs", 154 "all_dependent_configs",
149 "allow_circular_includes_from", 155 "allow_circular_includes_from",
150 "cflags", 156 "cflags",
brettw 2015/08/07 20:24:58 This list should match up with the set of variable
sdefresne 2015/08/08 10:01:20 Can this be addressed as a followup CL?
brettw 2015/08/08 16:23:02 Sure, whatever.
151 "cflags_c", 157 "cflags_c",
152 "cflags_cc", 158 "cflags_cc",
153 "cflags_objc", 159 "cflags_objc",
154 "cflags_objcc", 160 "cflags_objcc",
155 "check_includes", 161 "check_includes",
156 "forward_dependent_configs_from", 162 "forward_dependent_configs_from",
157 "include_dirs",
158 "ldflags", 163 "ldflags",
159 "libs", 164 "libs",
160 "output_extension", 165 "output_extension",
161 "output_name", 166 "output_name",
162 "public", 167 "public",
163 "public_configs", 168 "public_configs",
164 "public_deps", 169 "public_deps",
165 "visibility", 170 "visibility",
166 ]) 171 ])
167 172
(...skipping 25 matching lines...) Expand all
193 # All shared libraries must have the sanitizer deps to properly link in 198 # All shared libraries must have the sanitizer deps to properly link in
194 # asan mode (this target will be empty in other cases). 199 # asan mode (this target will be empty in other cases).
195 "//build/config/sanitizers:deps", 200 "//build/config/sanitizers:deps",
196 201
197 # Give tests the default manifest on Windows (a no-op elsewhere). 202 # Give tests the default manifest on Windows (a no-op elsewhere).
198 "//build/win:default_exe_manifest", 203 "//build/win:default_exe_manifest",
199 ] 204 ]
200 } 205 }
201 } 206 }
202 } 207 }
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