| 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 'includes': [ | 10 'includes': [ |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 'variables': { | 168 'variables': { |
| 169 'branding_dir': '../app/theme/chromium', | 169 'branding_dir': '../app/theme/chromium', |
| 170 }, | 170 }, |
| 171 }], | 171 }], |
| 172 ], | 172 ], |
| 173 }, | 173 }, |
| 174 'targets': [ | 174 'targets': [ |
| 175 { | 175 { |
| 176 'target_name': 'mini_installer', | 176 'target_name': 'mini_installer', |
| 177 'type': 'executable', | 177 'type': 'executable', |
| 178 'configurations': { | 178 |
| 179 'Debug': { | 179 # Disable precompiled headers for this project, to avoid |
| 180 # Disable precompiled headers for this project, to avoid | 180 # linker errors when building with VS 2008. |
| 181 # linker errors when building with VS 2008. | 181 'msvs_precompiled_header': '', |
| 182 # | 182 'msvs_precompiled_source': '', |
| 183 # Note that putting this in the 'target_defaults' | 183 |
| 184 # section earlier in the file does not successfully | |
| 185 # override the 'target_defaults' brought in by the | |
| 186 # build/win_precompile.gypi file, so the overriding | |
| 187 # needs to be done here, directly in the mini_installer | |
| 188 # target. | |
| 189 'msvs_precompiled_header': '', | |
| 190 'msvs_precompiled_source': '', | |
| 191 }, | |
| 192 }, | |
| 193 'sources': [ | 184 'sources': [ |
| 194 'mini_installer/chrome.release', | 185 'mini_installer/chrome.release', |
| 195 'mini_installer/chrome_appid.cc', | 186 'mini_installer/chrome_appid.cc', |
| 196 ], | 187 ], |
| 197 'rules': [ | 188 'rules': [ |
| 198 { | 189 { |
| 199 'rule_name': 'installer_archive', | 190 'rule_name': 'installer_archive', |
| 200 'extension': 'release', | 191 'extension': 'release', |
| 201 'variables': { | 192 'variables': { |
| 202 'create_installer_archive_py_path': | 193 'create_installer_archive_py_path': |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 'variables': { | 234 'variables': { |
| 244 'branding_dir': '../app/theme/google_chrome', | 235 'branding_dir': '../app/theme/google_chrome', |
| 245 }, | 236 }, |
| 246 }, { # else branding!="Chrome" | 237 }, { # else branding!="Chrome" |
| 247 'variables': { | 238 'variables': { |
| 248 'branding_dir': '../app/theme/chromium', | 239 'branding_dir': '../app/theme/chromium', |
| 249 }, | 240 }, |
| 250 }], | 241 }], |
| 251 ], | 242 ], |
| 252 } | 243 } |
| OLD | NEW |