summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcaitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 22:55:54 +0000
committercaitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 22:55:54 +0000
commit10dd721f4ec571d9970f5f29424118c5dbd17165 (patch)
treeab37939b512b9a71bf08757dbc6b97a3db099125
parente833dd42b23c7e47ecd7f7fbcf7deee751f96cc6 (diff)
downloadchromium_src-10dd721f4ec571d9970f5f29424118c5dbd17165.zip
chromium_src-10dd721f4ec571d9970f5f29424118c5dbd17165.tar.gz
chromium_src-10dd721f4ec571d9970f5f29424118c5dbd17165.tar.bz2
Set a base address for chrome_elf to avoid base address collisions with chrome_dll.
NOTRY=true BUG=318691 Review URL: https://codereview.chromium.org/75483002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235835 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome_elf/chrome_elf.gyp7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp
index c32f710..ca4f8c2 100644
--- a/chrome_elf/chrome_elf.gyp
+++ b/chrome_elf/chrome_elf.gyp
@@ -21,6 +21,13 @@
'chrome_elf_main.cc',
'chrome_elf_main.h',
],
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'BaseAddress': '0x35000000',
+ # Set /SUBSYSTEM:WINDOWS (for consistency).
+ 'SubSystem': '2',
+ },
+ },
},
],
} \ No newline at end of file