| Index: chrome_elf/chrome_elf.gyp
|
| diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp
|
| index 83514e73670541d8b6ddb75b63a8d780da09a97a..a6abc7dceac8801e3b117f5efcde102952f8dd4b 100644
|
| --- a/chrome_elf/chrome_elf.gyp
|
| +++ b/chrome_elf/chrome_elf.gyp
|
| @@ -24,7 +24,10 @@
|
| ],
|
| 'dependencies': [
|
| 'blacklist',
|
| + 'chrome_elf_breakpad',
|
| 'chrome_elf_lib',
|
| + # TODO(caitkp): Why do we need this here?
|
| + '../breakpad/breakpad.gyp:breakpad_handler',
|
| ],
|
| 'msvs_settings': {
|
| 'VCLinkerTool': {
|
| @@ -46,13 +49,13 @@
|
| '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',
|
| ],
|
| 'include_dirs': [
|
| '..',
|
| - '<(SHARED_INTERMEDIATE_DIR)',
|
| ],
|
| 'dependencies': [
|
| 'chrome_elf_lib',
|
| @@ -60,6 +63,7 @@
|
| '../base/base.gyp:run_all_unittests',
|
| '../base/base.gyp:test_support_base',
|
| '../sandbox/sandbox.gyp:sandbox',
|
| + '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| 'blacklist',
|
| 'blacklist_test_dll_1',
|
| @@ -87,14 +91,45 @@
|
| '..',
|
| ],
|
| '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',
|
| + ],
|
| + },
|
| + {
|
| + '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',
|
| + ],
|
| + },
|
| + {
|
| + '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': [
|
|
|