Index: chrome_elf/chrome_elf.gyp |
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp |
index d011bbb701c1472d6ab790d3ae64dba3c9604e54..94d1e934b1b8fcf099ecff0c552d4c8df9db0656 100644 |
--- a/chrome_elf/chrome_elf.gyp |
+++ b/chrome_elf/chrome_elf.gyp |
@@ -29,7 +29,7 @@ |
'msvs_settings': { |
'VCLinkerTool': { |
'BaseAddress': '0x01c20000', |
- # Set /SUBSYSTEM:WINDOWS for chrome_elf.dll (for consistency). |
+ # Set /SUBSYSTEM:WINDOWS. |
'SubSystem': '2', |
'AdditionalDependencies!': [ |
'user32.lib', |
@@ -46,6 +46,7 @@ |
'type': 'executable', |
'sources': [ |
'blacklist/test/blacklist_test.cc', |
+ 'create_file/chrome_create_file_unittest.cc', |
'elf_imports_unittest.cc', |
'ntdll_cache_unittest.cc', |
], |
@@ -66,6 +67,15 @@ |
'blacklist_test_dll_3', |
'blacklist_test_main_dll', |
], |
+ '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', |
+ ], |
+ }], |
+ ], |
}, |
{ |
# A dummy target to ensure that chrome_elf.dll and chrome.exe gets build |
@@ -86,10 +96,59 @@ |
'..', |
], |
'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', |
+ ], |
+ }], |
+ ], |
}, |
+ ], # targets |
+ 'conditions': [ |
+ ['component=="shared_library"', { |
+ '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', |
+ ], |
+ }], |
+ ], |
+ }, |
+ ], |
+ }], |
], |
} |
+ |