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

Side by Side Diff: components/crash.gypi

Issue 1423043002: Fix missing dependencies for //components/crash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: initial patch for review Created 5 years, 1 month 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 | « .gn ('k') | components/crash/content/app/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'targets': [ 6 'targets': [
7 { 7 {
8 # GN version: //components/crash/core/browser 8 # GN version: //components/crash/core/browser
9 'target_name': 'crash_core_browser', 9 'target_name': 'crash_core_browser',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 # Need 'target_conditions' to override default filename_rules to inc lude 162 # Need 'target_conditions' to override default filename_rules to inc lude
163 # the files on Android. 163 # the files on Android.
164 ['OS=="android"', { 164 ['OS=="android"', {
165 'sources/': [ 165 'sources/': [
166 ['include', '^crash/content/app/breakpad_linux\\.cc$'], 166 ['include', '^crash/content/app/breakpad_linux\\.cc$'],
167 ], 167 ],
168 }], 168 }],
169 ], 169 ],
170 }, 170 },
171 { 171 {
172 # Note: if you depend on this target, you need to either link in
173 # content.gyp:content_common, or add
174 # content/public/common/content_switches.cc to your sources.
175 #
Dirk Pranke 2015/10/26 21:57:27 In theory, depending directly on content should no
176 # GN version: //components/crash/content/app 172 # GN version: //components/crash/content/app
177 173
178 # TODO(mark): https://crbug.com/466890: merge this target with 174 # TODO(mark): https://crbug.com/466890: merge this target with
179 # crash_component_non_mac. 175 # crash_component_non_mac.
180 # 176 #
181 # Most of this target is actually in its dependency, 177 # Most of this target is actually in its dependency,
182 # crash_component_non_mac. See the comment in that target for an 178 # crash_component_non_mac. See the comment in that target for an
183 # explanation for the split. The split is temporary and the two target s 179 # explanation for the split. The split is temporary and the two target s
184 # will be unified again soon. 180 # will be unified again soon.
185 'target_name': 'crash_component', 181 'target_name': 'crash_component',
186 'variables': { 182 'variables': {
187 'conditions': [ 183 'conditions': [
188 ['OS != "mac" ', { 184 ['OS != "mac" ', {
189 # There are no source files on any platform but Mac OS X. 185 # There are no source files on any platform but Mac OS X.
190 'crash_component_target_type%': 'none', 186 'crash_component_target_type%': 'none',
191 }, { 187 }, {
192 'crash_component_target_type%': 'static_library', 188 'crash_component_target_type%': 'static_library',
193 }], 189 }],
194 ], 190 ],
195 }, 191 },
196 'type': '<(crash_component_target_type)', 192 'type': '<(crash_component_target_type)',
197 'sources': [ 193 'sources': [
198 'crash/content/app/crashpad_mac.h', 194 'crash/content/app/crashpad_mac.h',
199 'crash/content/app/crashpad_mac.mm', 195 'crash/content/app/crashpad_mac.mm',
200 ], 196 ],
201 'dependencies': [ 197 'dependencies': [
202 'crash_component_non_mac', 198 'crash_component_non_mac',
203 'crash_component_lib', 199 'crash_component_lib',
200 '../content/content.gyp:content_common',
Robert Sesek 2015/10/27 21:11:16 Is this the right target on which to add the depen
Dirk Pranke 2015/10/27 21:30:47 I think you're probably right.
204 '../base/base.gyp:base', 201 '../base/base.gyp:base',
205 ], 202 ],
206 'defines': ['CRASH_IMPLEMENTATION'], 203 'defines': ['CRASH_IMPLEMENTATION'],
207 'conditions': [ 204 'conditions': [
208 ['OS=="mac"', { 205 ['OS=="mac"', {
209 'dependencies': [ 206 'dependencies': [
210 '../third_party/crashpad/crashpad/client/client.gyp:crashpad_cli ent', 207 '../third_party/crashpad/crashpad/client/client.gyp:crashpad_cli ent',
211 ], 208 ],
212 }], 209 }],
213 ], 210 ],
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 'sources': [ 278 'sources': [
282 'crash/content/tools/crash_service.cc', 279 'crash/content/tools/crash_service.cc',
283 'crash/content/tools/crash_service.h', 280 'crash/content/tools/crash_service.h',
284 ], 281 ],
285 }, 282 },
286 ], 283 ],
287 }], 284 }],
288 ['OS=="win" and target_arch=="ia32"', { 285 ['OS=="win" and target_arch=="ia32"', {
289 'targets': [ 286 'targets': [
290 { 287 {
291 # Note: if you depend on this target, you need to either link in
292 # content.gyp:content_common, or add
293 # content/public/common/content_switches.cc to your sources.
294 'target_name': 'breakpad_win64', 288 'target_name': 'breakpad_win64',
295 'type': 'static_library', 289 'type': 'static_library',
296 'sources': [ 290 'sources': [
297 'crash/content/app/breakpad_linux.cc', 291 'crash/content/app/breakpad_linux.cc',
298 'crash/content/app/breakpad_linux.h', 292 'crash/content/app/breakpad_linux.h',
299 'crash/content/app/breakpad_linux_impl.h', 293 'crash/content/app/breakpad_linux_impl.h',
300 'crash/content/app/breakpad_mac.h', 294 'crash/content/app/breakpad_mac.h',
301 'crash/content/app/breakpad_mac.mm', 295 'crash/content/app/breakpad_mac.mm',
302 'crash/content/app/breakpad_win.cc', 296 'crash/content/app/breakpad_win.cc',
303 'crash/content/app/breakpad_win.h', 297 'crash/content/app/breakpad_win.h',
304 # TODO(siggi): test the x64 version too. 298 # TODO(siggi): test the x64 version too.
305 'crash/content/app/crash_keys_win.cc', 299 'crash/content/app/crash_keys_win.cc',
306 'crash/content/app/crash_keys_win.h', 300 'crash/content/app/crash_keys_win.h',
307 'crash/content/app/crash_reporter_client.cc', 301 'crash/content/app/crash_reporter_client.cc',
308 'crash/content/app/crash_reporter_client.h', 302 'crash/content/app/crash_reporter_client.h',
309 'crash/content/app/hard_error_handler_win.cc', 303 'crash/content/app/hard_error_handler_win.cc',
310 'crash/content/app/hard_error_handler_win.h', 304 'crash/content/app/hard_error_handler_win.h',
311 ], 305 ],
312 'defines': [ 306 'defines': [
313 'COMPILE_CONTENT_STATICALLY', 307 'COMPILE_CONTENT_STATICALLY',
314 'CRASH_IMPLEMENTATION', 308 'CRASH_IMPLEMENTATION',
315 ], 309 ],
316 'dependencies': [ 310 'dependencies': [
317 '../base/base.gyp:base_win64', 311 '../base/base.gyp:base_win64',
318 '../breakpad/breakpad.gyp:breakpad_handler_win64', 312 '../breakpad/breakpad.gyp:breakpad_handler_win64',
319 '../breakpad/breakpad.gyp:breakpad_sender_win64', 313 '../breakpad/breakpad.gyp:breakpad_sender_win64',
314 '../content/content.gyp:content_common',
320 '../sandbox/sandbox.gyp:sandbox_win64', 315 '../sandbox/sandbox.gyp:sandbox_win64',
321 ], 316 ],
322 'configurations': { 317 'configurations': {
323 'Common_Base': { 318 'Common_Base': {
324 'msvs_target_platform': 'x64', 319 'msvs_target_platform': 'x64',
325 }, 320 },
326 }, 321 },
327 }, 322 },
328 { 323 {
329 'target_name': 'breakpad_crash_service_win64', 324 'target_name': 'breakpad_crash_service_win64',
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 ], 388 ],
394 }], 389 }],
395 ], 390 ],
396 }, 391 },
397 ], 392 ],
398 }], 393 }],
399 ], 394 ],
400 }], 395 }],
401 ], 396 ],
402 } 397 }
OLDNEW
« no previous file with comments | « .gn ('k') | components/crash/content/app/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698