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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 1481703002: win: Move Crashpad all into chrome.exe (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix and rebase Created 5 years 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 | « chrome/browser_tests.isolate ('k') | chrome/chrome_exe.gypi » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'conditions': [ 5 'conditions': [
6 # Dummy target to allow chrome to require chrome_dll to build 6 # Dummy target to allow chrome to require chrome_dll to build
7 # without actually linking to the library 7 # without actually linking to the library
8 ['OS=="mac"', { 8 ['OS=="mac"', {
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 'app/chrome_main_delegate.h', 116 'app/chrome_main_delegate.h',
117 'app/chrome_main_mac.h', 117 'app/chrome_main_mac.h',
118 'app/chrome_main_mac.mm', 118 'app/chrome_main_mac.mm',
119 'app/close_handle_hook_win.cc', 119 'app/close_handle_hook_win.cc',
120 'app/close_handle_hook_win.h', 120 'app/close_handle_hook_win.h',
121 'app/delay_load_hook_win.cc', 121 'app/delay_load_hook_win.cc',
122 'app/delay_load_hook_win.h', 122 'app/delay_load_hook_win.h',
123 ], 123 ],
124 'dependencies': [ 124 'dependencies': [
125 '<@(chromium_browser_dependencies)', 125 '<@(chromium_browser_dependencies)',
126 '../components/components.gyp:crash_component',
127 '../content/content.gyp:content_app_browser', 126 '../content/content.gyp:content_app_browser',
128 '../third_party/crashpad/crashpad/handler/handler.gyp:crashpad_handl er',
129 ], 127 ],
130 'conditions': [ 128 'conditions': [
131 ['OS=="win"', { 129 ['OS=="win"', {
132 'dependencies': [ 130 'dependencies': [
133 '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf', 131 '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf',
134 ], 132 ],
135 }], 133 }],
136 ['OS=="win" and configuration_policy==1', { 134 ['OS=="win" and configuration_policy==1', {
137 'dependencies': [ 135 'dependencies': [
138 '<(DEPTH)/components/components.gyp:policy', 136 '<(DEPTH)/components/components.gyp:policy',
(...skipping 19 matching lines...) Expand all
158 'chrome_version_resources', 156 'chrome_version_resources',
159 '../base/trace_event/etw_manifest/etw_manifest.gyp:etw_manifest' , 157 '../base/trace_event/etw_manifest/etw_manifest.gyp:etw_manifest' ,
160 '../chrome/chrome_resources.gyp:chrome_unscaled_resources', 158 '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
161 '../content/app/resources/content_resources.gyp:content_resource s', 159 '../content/app/resources/content_resources.gyp:content_resource s',
162 '../crypto/crypto.gyp:crypto', 160 '../crypto/crypto.gyp:crypto',
163 '../net/net.gyp:net_resources', 161 '../net/net.gyp:net_resources',
164 '../ui/views/views.gyp:views', 162 '../ui/views/views.gyp:views',
165 ], 163 ],
166 'sources': [ 164 'sources': [
167 'app/chrome_dll.rc', 165 'app/chrome_dll.rc',
168 'app/chrome_crash_reporter_client.cc',
169 'app/chrome_crash_reporter_client.h',
170 166
171 # ETW Manifest. 167 # ETW Manifest.
172 '<(SHARED_INTERMEDIATE_DIR)/base/trace_event/etw_manifest/chrome _events_win.rc', 168 '<(SHARED_INTERMEDIATE_DIR)/base/trace_event/etw_manifest/chrome _events_win.rc',
173 169
174 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc ', 170 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc ',
175 171
176 # Cursors. 172 # Cursors.
177 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.r c', 173 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.r c',
178 ], 174 ],
179 'include_dirs': [ 175 'include_dirs': [
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 ['OS=="mac" and component!="shared_library"', { 293 ['OS=="mac" and component!="shared_library"', {
298 'includes': [ 'chrome_dll_bundle.gypi' ], 294 'includes': [ 'chrome_dll_bundle.gypi' ],
299 }], 295 }],
300 ['OS=="mac" and component=="shared_library"', { 296 ['OS=="mac" and component=="shared_library"', {
301 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], }, 297 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], },
302 }], 298 }],
303 ['OS=="mac"', { 299 ['OS=="mac"', {
304 'dependencies': [ 300 'dependencies': [
305 '../components/components.gyp:crash_component', 301 '../components/components.gyp:crash_component',
306 '../components/components.gyp:policy', 302 '../components/components.gyp:policy',
303 '../third_party/crashpad/crashpad/handler/handler.gyp:crashpad_h andler',
307 ], 304 ],
308 'sources': [ 305 'sources': [
309 'app/chrome_crash_reporter_client.cc', 306 'app/chrome_crash_reporter_client.cc',
310 'app/chrome_crash_reporter_client.h', 307 'app/chrome_crash_reporter_client.h',
311 'app/chrome_crash_reporter_client_mac.mm', 308 'app/chrome_crash_reporter_client_mac.mm',
312 ], 309 ],
313 'xcode_settings': { 310 'xcode_settings': {
314 # Define the order of symbols within the framework. This 311 # Define the order of symbols within the framework. This
315 # sets -order_file. 312 # sets -order_file.
316 'ORDER_FILE': 'app/framework.order', 313 'ORDER_FILE': 'app/framework.order',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 # GN version: //chrome:chrome_child 345 # GN version: //chrome:chrome_child
349 'target_name': 'chrome_child_dll', 346 'target_name': 'chrome_child_dll',
350 'type': 'shared_library', 347 'type': 'shared_library',
351 'product_name': 'chrome_child', 348 'product_name': 'chrome_child',
352 'variables': { 349 'variables': {
353 'enable_wexit_time_destructors': 1, 350 'enable_wexit_time_destructors': 1,
354 }, 351 },
355 'dependencies': [ 352 'dependencies': [
356 '<@(chromium_child_dependencies)', 353 '<@(chromium_child_dependencies)',
357 '../components/components.gyp:browser_watcher_client', 354 '../components/components.gyp:browser_watcher_client',
358 '../components/components.gyp:crash_component',
359 '../content/content.gyp:content_app_child', 355 '../content/content.gyp:content_app_child',
360 'chrome_version_resources', 356 'chrome_version_resources',
361 'policy_path_parser', 357 'policy_path_parser',
362 ], 358 ],
363 'defines': [ 359 'defines': [
364 'CHROME_MULTIPLE_DLL_CHILD', 360 'CHROME_MULTIPLE_DLL_CHILD',
365 ], 361 ],
366 'sources': [ 362 'sources': [
367 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', 363 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
368 'app/chrome_crash_reporter_client.cc',
369 'app/chrome_crash_reporter_client.h',
370 'app/chrome_main.cc', 364 'app/chrome_main.cc',
371 'app/chrome_main_delegate.cc', 365 'app/chrome_main_delegate.cc',
372 'app/chrome_main_delegate.h', 366 'app/chrome_main_delegate.h',
373 'app/close_handle_hook_win.cc', 367 'app/close_handle_hook_win.cc',
374 'app/close_handle_hook_win.h', 368 'app/close_handle_hook_win.h',
375 ], 369 ],
376 'conditions': [ 370 'conditions': [
377 ['OS=="win" and win_use_allocator_shim==1', { 371 ['OS=="win" and win_use_allocator_shim==1', {
378 'dependencies': [ 372 'dependencies': [
379 '<(allocator_target)', 373 '<(allocator_target)',
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 'dependencies': [ 408 'dependencies': [
415 '../pdf/pdf.gyp:pdf', 409 '../pdf/pdf.gyp:pdf',
416 ], 410 ],
417 }], 411 }],
418 ], 412 ],
419 }, # target chrome_child_dll 413 }, # target chrome_child_dll
420 ], 414 ],
421 }], 415 }],
422 ], 416 ],
423 } 417 }
OLDNEW
« no previous file with comments | « chrome/browser_tests.isolate ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698