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

Unified Diff: chrome_elf/chrome_elf.gyp

Issue 154653002: Breakpad coverage for chrome_elf start up (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests on chromium builds Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_elf/breakpad.cc ('k') | chrome_elf/chrome_elf_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_elf/chrome_elf.gyp
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp
index 3db44c6e6473c4450b274f137ebf7cc3cc20d15c..cc09723ae30346486ec1779367aa674e6589dcb9 100644
--- a/chrome_elf/chrome_elf.gyp
+++ b/chrome_elf/chrome_elf.gyp
@@ -24,6 +24,7 @@
],
'dependencies': [
'blacklist',
+ 'chrome_elf_breakpad',
'chrome_elf_lib',
],
'msvs_settings': {
@@ -46,6 +47,7 @@
'type': 'executable',
'sources': [
'blacklist/test/blacklist_test.cc',
+ 'chrome_elf_util_unittest.cc',
'create_file/chrome_create_file_unittest.cc',
'elf_imports_unittest.cc',
'ntdll_cache_unittest.cc',
@@ -96,14 +98,14 @@
'..',
],
'sources': [
- 'chrome_elf_constants.cc',
- 'chrome_elf_constants.h',
- 'chrome_elf_types.h',
'create_file/chrome_create_file.cc',
'create_file/chrome_create_file.h',
'ntdll_cache.cc',
'ntdll_cache.h',
],
+ 'dependencies': [
+ 'chrome_elf_common',
+ ],
'conditions': [
['component=="shared_library"', {
# In component builds, all targets depend on chrome_redirects by
@@ -114,6 +116,46 @@
}],
],
},
+ {
+ 'target_name': 'chrome_elf_common',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '..',
+ ],
+ 'sources': [
+ 'chrome_elf_constants.cc',
+ 'chrome_elf_constants.h',
+ 'chrome_elf_types.h',
+ 'chrome_elf_util.cc',
+ 'chrome_elf_util.h',
+ ],
+ 'conditions': [
+ ['component=="shared_library"', {
+ # In component builds, all targets depend on chrome_redirects by
+ # default. Remove it here so we are able to test it.
+ 'dependencies!': [
+ '../chrome_elf/chrome_elf.gyp:chrome_redirects',
+ ],
+ }],
+ ],
+ },
+ {
+ 'target_name': 'chrome_elf_breakpad',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '..',
+ '<(SHARED_INTERMEDIATE_DIR)',
+ ],
+ 'sources': [
+ 'breakpad.cc',
+ 'breakpad.h',
+ ],
+ 'dependencies': [
+ 'chrome_elf_common',
+ '../breakpad/breakpad.gyp:breakpad_handler',
+ '../chrome/chrome.gyp:chrome_version_header',
+ ],
+ },
], # targets
'conditions': [
['component=="shared_library"', {
« no previous file with comments | « chrome_elf/breakpad.cc ('k') | chrome_elf/chrome_elf_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698