diff options
author | caitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 13:49:01 +0000 |
---|---|---|
committer | caitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 13:49:01 +0000 |
commit | 8d43ab37f97f6875b85149e9e70c45830f0c4655 (patch) | |
tree | a451f95029b234bd2f657882cd49e2463a4e7319 /chrome_elf/chrome_elf.gyp | |
parent | 466df09d585afe8ff4f3e60364dbf1ce3e618c6d (diff) | |
download | chromium_src-8d43ab37f97f6875b85149e9e70c45830f0c4655.zip chromium_src-8d43ab37f97f6875b85149e9e70c45830f0c4655.tar.gz chromium_src-8d43ab37f97f6875b85149e9e70c45830f0c4655.tar.bz2 |
Use an alternate mechanism for CreateFile calls in Chrome
BUG=334379
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=245464
Review URL: https://codereview.chromium.org/138593004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf/chrome_elf.gyp')
-rw-r--r-- | chrome_elf/chrome_elf.gyp | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp index d011bbb..98da2d7 100644 --- a/chrome_elf/chrome_elf.gyp +++ b/chrome_elf/chrome_elf.gyp @@ -11,6 +11,35 @@ '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', @@ -25,11 +54,12 @@ 'dependencies': [ 'blacklist', 'chrome_elf_lib', + 'chrome_redirects', ], 'msvs_settings': { 'VCLinkerTool': { 'BaseAddress': '0x01c20000', - # Set /SUBSYSTEM:WINDOWS for chrome_elf.dll (for consistency). + # Set /SUBSYSTEM:WINDOWS. 'SubSystem': '2', 'AdditionalDependencies!': [ 'user32.lib', @@ -46,6 +76,7 @@ 'type': 'executable', 'sources': [ 'blacklist/test/blacklist_test.cc', + 'create_file/chrome_create_file_unittest.cc', 'elf_imports_unittest.cc', 'ntdll_cache_unittest.cc', ], @@ -86,10 +117,23 @@ '..', ], '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', + ], + }], + ], }, ], } |