diff options
Diffstat (limited to 'chrome_elf/chrome_elf.gyp')
| -rw-r--r-- | chrome_elf/chrome_elf.gyp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp index 7eeae2b..0b612a8 100644 --- a/chrome_elf/chrome_elf.gyp +++ b/chrome_elf/chrome_elf.gyp @@ -57,7 +57,12 @@ ], 'msvs_settings': { 'VCLinkerTool': { - 'BaseAddress': '0x01c20000', + 'conditions': [ + ['target_arch=="ia32"', { + # Don't set an x64 base address (to avoid breaking HE-ASLR). + 'BaseAddress': '0x01c20000', + }], + ], # Set /SUBSYSTEM:WINDOWS. 'SubSystem': '2', 'AdditionalDependencies!': [ @@ -192,7 +197,12 @@ ], 'msvs_settings': { 'VCLinkerTool': { - 'BaseAddress': '0x01c10000', + 'conditions': [ + ['target_arch=="ia32"', { + # Don't set an x64 base address (to avoid breaking HE-ASLR). + 'BaseAddress': '0x01c20000', + }], + ], # Set /SUBSYSTEM:WINDOWS. 'SubSystem': '2', }, |