Index: trunk/src/chrome_elf/chrome_elf.gyp |
=================================================================== |
--- trunk/src/chrome_elf/chrome_elf.gyp (revision 245500) |
+++ trunk/src/chrome_elf/chrome_elf.gyp (working copy) |
@@ -11,35 +11,6 @@ |
'blacklist.gypi', |
], |
'targets': [ |
- { |
- 'target_name': 'chrome_redirects', |
- 'type': 'shared_library', |
- 'include_dirs': [ |
- '..', |
- ], |
- 'sources': [ |
- 'chrome_redirects.def', |
- ], |
- 'dependencies': [ |
- 'chrome_elf_lib', |
- ], |
- 'msvs_settings': { |
- 'VCLinkerTool': { |
- 'BaseAddress': '0x01c10000', |
- # Set /SUBSYSTEM:WINDOWS. |
- 'SubSystem': '2', |
- }, |
- }, |
- 'conditions': [ |
- ['component=="shared_library"', { |
- # In component builds, all targets depend on chrome_redirects by |
- # default. Remove it here to avoid a circular dependency. |
- 'dependencies!': [ |
- '../chrome_elf/chrome_elf.gyp:chrome_redirects', |
- ], |
- }], |
- ], |
- }, |
{ |
'target_name': 'chrome_elf', |
'type': 'shared_library', |
@@ -54,12 +25,11 @@ |
'dependencies': [ |
'blacklist', |
'chrome_elf_lib', |
- 'chrome_redirects', |
], |
'msvs_settings': { |
'VCLinkerTool': { |
'BaseAddress': '0x01c20000', |
- # Set /SUBSYSTEM:WINDOWS. |
+ # Set /SUBSYSTEM:WINDOWS for chrome_elf.dll (for consistency). |
'SubSystem': '2', |
'AdditionalDependencies!': [ |
'user32.lib', |
@@ -75,7 +45,6 @@ |
'type': 'executable', |
'sources': [ |
'blacklist/test/blacklist_test.cc', |
- 'create_file/chrome_create_file_unittest.cc', |
'elf_imports_unittest.cc', |
'ntdll_cache_unittest.cc', |
], |
@@ -104,23 +73,10 @@ |
'..', |
], |
'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', |
], |
- 'conditions': [ |
- ['component=="shared_library"', { |
- # In component builds, all targets depend on chrome_redirects by |
- # default. Remove it here to avoid a circular dependency. |
- 'dependencies!': [ |
- '../chrome_elf/chrome_elf.gyp:chrome_redirects', |
- ], |
- }], |
- ], |
}, |
], |
} |