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

Side by Side Diff: chrome_elf/chrome_elf.gyp

Issue 2088133002: Switch chrome_elf exception handling from breakpad to crashpad. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update commments and attempt to fix dependency failure Created 4 years, 6 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 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'includes': [ 8 'includes': [
9 '../build/util/version.gypi', 9 '../build/util/version.gypi',
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 19 matching lines...) Expand all
30 { 30 {
31 'target_name': 'chrome_elf', 31 'target_name': 'chrome_elf',
32 'type': 'shared_library', 32 'type': 'shared_library',
33 'include_dirs': [ 33 'include_dirs': [
34 '..', 34 '..',
35 ], 35 ],
36 'sources': [ 36 'sources': [
37 'chrome_elf.def', 37 'chrome_elf.def',
38 'chrome_elf_main.cc', 38 'chrome_elf_main.cc',
39 'chrome_elf_main.h', 39 'chrome_elf_main.h',
40 'crashpad_helper.cc',
scottmg 2016/06/22 19:38:07 Same for gyp.
41 'crashpad_helper.h',
40 '../chrome/app/chrome_crash_reporter_client_win.cc', 42 '../chrome/app/chrome_crash_reporter_client_win.cc',
41 '../chrome/app/chrome_crash_reporter_client_win.h', 43 '../chrome/app/chrome_crash_reporter_client_win.h',
42 '<(SHARED_INTERMEDIATE_DIR)/chrome_elf/chrome_elf_version.rc', 44 '<(SHARED_INTERMEDIATE_DIR)/chrome_elf/chrome_elf_version.rc',
43 ], 45 ],
44 'dependencies': [ 46 'dependencies': [
45 'blacklist', 47 'blacklist',
46 'chrome_elf_breakpad',
47 'chrome_elf_resources', 48 'chrome_elf_resources',
48 '../chrome/chrome.gyp:install_static_util', 49 '../chrome/chrome.gyp:install_static_util',
49 '../components/components.gyp:crash_component', 50 '../components/components.gyp:crash_component',
50 '../components/components.gyp:crash_core_common', 51 '../components/components.gyp:crash_core_common',
51 ], 52 ],
52 'msvs_settings': { 53 'msvs_settings': {
53 'VCLinkerTool': { 54 'VCLinkerTool': {
54 'conditions': [ 55 'conditions': [
55 ['target_arch=="ia32"', { 56 ['target_arch=="ia32"', {
56 # Don't set an x64 base address (to avoid breaking HE-ASLR). 57 # Don't set an x64 base address (to avoid breaking HE-ASLR).
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 'chrome_elf_constants', 127 'chrome_elf_constants',
127 ], 128 ],
128 'include_dirs': [ 129 'include_dirs': [
129 '..', 130 '..',
130 ], 131 ],
131 'sources': [ 132 'sources': [
132 'thunk_getter.cc', 133 'thunk_getter.cc',
133 'thunk_getter.h', 134 'thunk_getter.h',
134 ], 135 ],
135 }, 136 },
136 {
137 'target_name': 'chrome_elf_breakpad',
138 'type': 'static_library',
139 'include_dirs': [
140 '..',
141 '<(SHARED_INTERMEDIATE_DIR)',
142 ],
143 'sources': [
144 'breakpad.cc',
145 'breakpad.h',
146 ],
147 'dependencies': [
148 'chrome_elf_common',
149 '../breakpad/breakpad.gyp:breakpad_handler',
150 '../chrome/common_constants.gyp:version_header',
151 '../chrome/chrome.gyp:install_static_util',
152 ],
153 },
154 ], # targets 137 ], # targets
155 'conditions': [ 138 'conditions': [
156 ['test_isolation_mode != "noop"', { 139 ['test_isolation_mode != "noop"', {
157 'targets': [ 140 'targets': [
158 { 141 {
159 'target_name': 'chrome_elf_unittests_run', 142 'target_name': 'chrome_elf_unittests_run',
160 'type': 'none', 143 'type': 'none',
161 'dependencies': [ 144 'dependencies': [
162 'chrome_elf_unittests', 145 'chrome_elf_unittests',
163 ], 146 ],
164 'includes': [ '../build/isolate.gypi' ], 147 'includes': [ '../build/isolate.gypi' ],
165 'sources': [ 'chrome_elf_unittests.isolate' ], 148 'sources': [ 'chrome_elf_unittests.isolate' ],
166 }, 149 },
167 ], 150 ],
168 }], 151 }],
169 ], 152 ],
170 } 153 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698