summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-28 19:02:40 +0000
committerbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-28 19:02:40 +0000
commite3402fed6fc835ea32d26002eb13570bc4ac42a0 (patch)
tree0f26ab428a1a5956f78670ac52b81cefb616364d /chrome
parentbb64e11d986551e16b51f67034335ef4cc5c2a8c (diff)
downloadchromium_src-e3402fed6fc835ea32d26002eb13570bc4ac42a0.zip
chromium_src-e3402fed6fc835ea32d26002eb13570bc4ac42a0.tar.gz
chromium_src-e3402fed6fc835ea32d26002eb13570bc4ac42a0.tar.bz2
Switching mini_installer to be gyp generated.
BUG=None TEST=None TBR=sgk Review URL: http://codereview.chromium.org/151005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19476 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/installer/installer.gyp3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index ea40247..d2efe4b 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -310,7 +310,6 @@
'target_name': 'mini_installer',
'type': 'executable',
'msvs_guid': '24A5AC7C-280B-4899-9153-6BA570A081E7',
- 'msvs_existing_vcproj': 'mini_installer/mini_installer.vcproj',
'dependencies': [
'../chrome.gyp:chrome',
'../chrome.gyp:chrome_dll',
@@ -339,6 +338,8 @@
'BufferSecurityCheck': 'false',
},
'VCLinkerTool': {
+ 'RandomizedBaseAddress': '1',
+ 'DataExecutionPrevention': '0',
'AdditionalDependencies': [
'"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"',
'"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"',