| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'version_py': '../../chrome/tools/build/version.py', | 3 'version_py': '../../chrome/tools/build/version.py', |
| 4 'version_path': '../../chrome/VERSION', | 4 'version_path': '../../chrome/VERSION', |
| 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', | 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', |
| 6 # 'branding_dir' is set in the 'conditions' section at the bottom. | 6 # 'branding_dir' is set in the 'conditions' section at the bottom. |
| 7 'msvs_use_common_release': 0, | 7 'msvs_use_common_release': 0, |
| 8 'msvs_use_common_linker_extras': 0, | 8 'msvs_use_common_linker_extras': 0, |
| 9 }, | 9 }, |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 'includes': ['../../build/internal/release_defaults.gypi'], | 103 'includes': ['../../build/internal/release_defaults.gypi'], |
| 104 'msvs_settings': { | 104 'msvs_settings': { |
| 105 'VCCLCompilerTool': { | 105 'VCCLCompilerTool': { |
| 106 'EnableIntrinsicFunctions': 'true', | 106 'EnableIntrinsicFunctions': 'true', |
| 107 'BasicRuntimeChecks': '0', | 107 'BasicRuntimeChecks': '0', |
| 108 'BufferSecurityCheck': 'false', | 108 'BufferSecurityCheck': 'false', |
| 109 'ExceptionHandling': '0', | 109 'ExceptionHandling': '0', |
| 110 }, | 110 }, |
| 111 'VCLinkerTool': { | 111 'VCLinkerTool': { |
| 112 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 112 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
| 113 'Profile': 'false', # Conflicts with /FIXED |
| 113 'AdditionalOptions': [ | 114 'AdditionalOptions': [ |
| 114 '/SAFESEH:NO', | 115 '/SAFESEH:NO', |
| 115 '/NXCOMPAT', | 116 '/NXCOMPAT', |
| 116 '/DYNAMICBASE:NO', | 117 '/DYNAMICBASE:NO', |
| 117 '/FIXED', | 118 '/FIXED', |
| 118 ], | 119 ], |
| 119 }, | 120 }, |
| 120 }, | 121 }, |
| 121 }, | 122 }, |
| 122 }, | 123 }, |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 'variables': { | 226 'variables': { |
| 226 'branding_dir': '../app/theme/google_chrome', | 227 'branding_dir': '../app/theme/google_chrome', |
| 227 }, | 228 }, |
| 228 }, { # else branding!="Chrome" | 229 }, { # else branding!="Chrome" |
| 229 'variables': { | 230 'variables': { |
| 230 'branding_dir': '../app/theme/chromium', | 231 'branding_dir': '../app/theme/chromium', |
| 231 }, | 232 }, |
| 232 }], | 233 }], |
| 233 ], | 234 ], |
| 234 } | 235 } |
| OLD | NEW |