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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 7827021: Changed mac and win Official Chrome build to drop default app CRXs in the build/installer output. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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_dll.gypi ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 7 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
8 # 'branding_dir' is set in the 'conditions' section at the bottom. 8 # 'branding_dir' is set in the 'conditions' section at the bottom.
9 }, 9 },
10 'conditions': [ 10 'conditions': [
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 '<(PRODUCT_DIR)/chrome', 405 '<(PRODUCT_DIR)/chrome',
406 '<(PRODUCT_DIR)/chrome.pak', 406 '<(PRODUCT_DIR)/chrome.pak',
407 '<(PRODUCT_DIR)/chrome_sandbox', 407 '<(PRODUCT_DIR)/chrome_sandbox',
408 '<(PRODUCT_DIR)/libffmpegsumo.so', 408 '<(PRODUCT_DIR)/libffmpegsumo.so',
409 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', 409 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
410 '<(PRODUCT_DIR)/xdg-mime', 410 '<(PRODUCT_DIR)/xdg-mime',
411 '<(PRODUCT_DIR)/xdg-settings', 411 '<(PRODUCT_DIR)/xdg-settings',
412 '<(PRODUCT_DIR)/locales/en-US.pak', 412 '<(PRODUCT_DIR)/locales/en-US.pak',
413 '<(PRODUCT_DIR)/nacl_helper', 413 '<(PRODUCT_DIR)/nacl_helper',
414 '<(PRODUCT_DIR)/nacl_helper_bootstrap', 414 '<(PRODUCT_DIR)/nacl_helper_bootstrap',
415 '<(PRODUCT_DIR)/default_apps/gmail.crx',
416 '<(PRODUCT_DIR)/default_apps/youtube.crx',
415 ], 417 ],
416 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'], 418 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'],
417 'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh', 419 'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh',
418 'rpm_build': '<(PRODUCT_DIR)/installer/rpm/build.sh', 420 'rpm_build': '<(PRODUCT_DIR)/installer/rpm/build.sh',
419 'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)', 421 'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)',
420 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], 422 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'],
421 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)', 423 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)',
422 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], 424 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'],
423 'conditions': [ 425 'conditions': [
424 ['target_arch=="ia32"', { 426 ['target_arch=="ia32"', {
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 'variables': { 919 'variables': {
918 'branding_dir': 'app/theme/google_chrome', 920 'branding_dir': 'app/theme/google_chrome',
919 }, 921 },
920 }, { # else branding!="Chrome" 922 }, { # else branding!="Chrome"
921 'variables': { 923 'variables': {
922 'branding_dir': 'app/theme/chromium', 924 'branding_dir': 'app/theme/chromium',
923 }, 925 },
924 }], 926 }],
925 ], 927 ],
926 } 928 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698