Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(359)

Side by Side Diff: chrome/installer/mini_installer.gyp

Issue 10875008: Integrate the Windows 8 code into the Chromium tree. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove conflicting OWNERS file. Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/tools/build/win/check_sdk_patch.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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': '<(DEPTH)/build/util/LASTCHANGE', 5 'lastchange_path': '<(DEPTH)/build/util/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 'mini_installer_internal_deps%': 0, 9 'mini_installer_internal_deps%': 0,
10 'mini_installer_official_deps%': 0, 10 'mini_installer_official_deps%': 0,
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 #'--last_chrome_installer=C:/Temp/base', 265 #'--last_chrome_installer=C:/Temp/base',
266 #'--setup_exe_format=DIFF', 266 #'--setup_exe_format=DIFF',
267 #'--diff_algorithm=COURGETTE', 267 #'--diff_algorithm=COURGETTE',
268 ], 268 ],
269 'message': 'Create installer archive' 269 'message': 'Create installer archive'
270 }, 270 },
271 ], 271 ],
272 }, 272 },
273 ], 273 ],
274 }], 274 }],
275 [ 'mini_installer_internal_deps == 1 or mini_installer_official_deps == 1', {
276 'target_defaults': {
277 'dependencies': [
278 'mini_installer/support/mini_installer_support.gyp:*',
279 ],
280 },
281 }],
282 [ 'branding == "Chrome"', { 275 [ 'branding == "Chrome"', {
283 'variables': { 276 'variables': {
284 'branding_dir': '../app/theme/google_chrome', 277 'branding_dir': '../app/theme/google_chrome',
285 }, 278 },
286 }, { # else branding!="Chrome" 279 }, { # else branding!="Chrome"
287 'variables': { 280 'variables': {
288 'branding_dir': '../app/theme/chromium', 281 'branding_dir': '../app/theme/chromium',
289 }, 282 },
290 }], 283 }],
291 ], 284 ],
292 } 285 }
OLDNEW
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/tools/build/win/check_sdk_patch.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698