Chromium Code Reviews| Index: chrome_elf/chrome_elf.gyp |
| diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp |
| index 034476a6568d865848c9ab957e793ab99fa4c2c8..d6d49e1d39feea402f89608240a54da23c6eb5ad 100644 |
| --- a/chrome_elf/chrome_elf.gyp |
| +++ b/chrome_elf/chrome_elf.gyp |
| @@ -12,6 +12,9 @@ |
| 'dll_hash.gypi', |
| ], |
| 'targets': [ |
| + ##------------------------------------------------------------------------------ |
|
robertshield
2016/06/17 13:40:03
nit: wrap
penny
2016/06/22 23:13:14
Done.
|
| + ## chrome_elf |
| + ##------------------------------------------------------------------------------ |
| { |
| 'target_name': 'chrome_elf_resources', |
| 'type': 'none', |
| @@ -40,10 +43,12 @@ |
| '<(SHARED_INTERMEDIATE_DIR)/chrome_elf/chrome_elf_version.rc', |
| ], |
| 'dependencies': [ |
| + '../chrome/chrome.gyp:install_static_util', |
| 'blacklist', |
| 'chrome_elf_breakpad', |
| + 'chrome_elf_hook_util', |
| 'chrome_elf_resources', |
| - '../chrome/chrome.gyp:install_static_util', |
| + 'nt_registry/nt_registry.gyp:chrome_elf_nt_registry', |
| ], |
| 'msvs_settings': { |
| 'VCLinkerTool': { |
| @@ -64,6 +69,52 @@ |
| }, |
| }, |
| }, |
| + ##------------------------------------------------------------------------------ |
|
robertshield
2016/06/17 13:40:03
nit: wrap
penny
2016/06/22 23:13:14
Done.
|
| + ## chrome_elf sub targets |
| + ##------------------------------------------------------------------------------ |
| + { |
| + 'target_name': 'chrome_elf_constants', |
| + 'type': 'static_library', |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + 'sources': [ |
| + 'chrome_elf_constants.cc', |
| + 'chrome_elf_constants.h', |
| + ], |
| + }, |
| + { |
| + 'target_name': 'chrome_elf_breakpad', |
| + 'type': 'static_library', |
| + 'include_dirs': [ |
| + '..', |
| + '<(SHARED_INTERMEDIATE_DIR)', |
| + ], |
| + 'sources': [ |
| + 'breakpad/breakpad.cc', |
| + 'breakpad/breakpad.h', |
| + ], |
| + 'dependencies': [ |
| + '../breakpad/breakpad.gyp:breakpad_handler', |
| + '../chrome/chrome.gyp:install_static_util', |
| + '../chrome/common_constants.gyp:version_header', |
| + 'nt_registry/nt_registry.gyp:chrome_elf_nt_registry', |
| + ], |
| + }, |
| + { |
| + 'target_name': 'chrome_elf_hook_util', |
| + 'type': 'static_library', |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + 'sources': [ |
| + 'hook_util/thunk_getter.cc', |
| + 'hook_util/thunk_getter.h', |
| + ], |
| + }, |
| + ##------------------------------------------------------------------------------ |
|
robertshield
2016/06/17 13:40:03
nit: wrap
penny
2016/06/22 23:13:14
Done.
|
| + ## tests |
| + ##------------------------------------------------------------------------------ |
| { |
| 'target_name': 'chrome_elf_unittests_exe', |
| 'product_name': 'chrome_elf_unittests', |
| @@ -89,6 +140,8 @@ |
| 'blacklist_test_dll_2', |
| 'blacklist_test_dll_3', |
| 'blacklist_test_main_dll', |
| + 'chrome_elf_hook_util', |
| + 'nt_registry/nt_registry.gyp:chrome_elf_nt_registry', |
| ], |
| }, |
| { |
| @@ -104,50 +157,10 @@ |
| 'chrome_elf_unittests_exe', |
| ], |
| }, |
| - { |
| - 'target_name': 'chrome_elf_constants', |
| - 'type': 'static_library', |
| - 'include_dirs': [ |
| - '..', |
| - ], |
| - 'sources': [ |
| - 'chrome_elf_constants.cc', |
| - 'chrome_elf_constants.h', |
| - ], |
| - }, |
| - { |
| - 'target_name': 'chrome_elf_common', |
| - 'type': 'static_library', |
| - 'dependencies': [ |
| - 'chrome_elf_constants', |
| - ], |
| - 'include_dirs': [ |
| - '..', |
| - ], |
| - 'sources': [ |
| - 'thunk_getter.cc', |
| - 'thunk_getter.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/common_constants.gyp:version_header', |
| - '../chrome/chrome.gyp:install_static_util', |
| - ], |
| - }, |
| ], # targets |
| + ##------------------------------------------------------------------------------ |
|
robertshield
2016/06/17 13:40:03
nit: wrap
penny
2016/06/22 23:13:14
Done.
|
| + ## conditionals |
| + ##------------------------------------------------------------------------------ |
| 'conditions': [ |
| ['test_isolation_mode != "noop"', { |
| 'targets': [ |