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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 777533006: Linux: Use an administrative directory from Precise on Trusty for deb package builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « no previous file | chrome/installer/linux/debian/build.sh » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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': '../build/util/LASTCHANGE', 7 'lastchange_path': '../build/util/LASTCHANGE',
8 'libpeer_target_type%': 'static_library', 8 'libpeer_target_type%': 'static_library',
9 # 'branding_dir' is set in the 'conditions' section at the bottom. 9 # 'branding_dir' is set in the 'conditions' section at the bottom.
10 }, 10 },
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 '<(PRODUCT_DIR)/xdg-settings', 462 '<(PRODUCT_DIR)/xdg-settings',
463 '<(PRODUCT_DIR)/locales/en-US.pak', 463 '<(PRODUCT_DIR)/locales/en-US.pak',
464 '<(PRODUCT_DIR)/nacl_helper', 464 '<(PRODUCT_DIR)/nacl_helper',
465 '<(PRODUCT_DIR)/nacl_helper_bootstrap', 465 '<(PRODUCT_DIR)/nacl_helper_bootstrap',
466 '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so', 466 '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so',
467 '<(PRODUCT_DIR)/PepperFlash/manifest.json', 467 '<(PRODUCT_DIR)/PepperFlash/manifest.json',
468 '<@(default_apps_list_linux_dest)', 468 '<@(default_apps_list_linux_dest)',
469 ], 469 ],
470 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'], 470 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'],
471 'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh', 471 'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh',
472 'dpkg_dir': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/precise_va r_dpkg',
472 'rpm_build': '<(PRODUCT_DIR)/installer/rpm/build.sh', 473 'rpm_build': '<(PRODUCT_DIR)/installer/rpm/build.sh',
473 'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)', 474 'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)',
474 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], 475 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)',
476 '-d', '<(dpkg_dir)'],
475 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)', 477 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)',
476 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], 478 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'],
477 'conditions': [ 479 'conditions': [
478 ['target_arch=="ia32"', { 480 ['target_arch=="ia32"', {
479 'deb_arch': 'i386', 481 'deb_arch': 'i386',
480 'rpm_arch': 'i386', 482 'rpm_arch': 'i386',
481 'packaging_files_binaries': [ 483 'packaging_files_binaries': [
482 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 484 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
483 '<(PRODUCT_DIR)/libwidevinecdmadapter.so', 485 '<(PRODUCT_DIR)/libwidevinecdmadapter.so',
484 '<(PRODUCT_DIR)/libwidevinecdm.so', 486 '<(PRODUCT_DIR)/libwidevinecdm.so',
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1091 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1090 }, 1092 },
1091 }, { # else branding!="Chrome" 1093 }, { # else branding!="Chrome"
1092 'variables': { 1094 'variables': {
1093 'branding_dir': 'app/theme/chromium', 1095 'branding_dir': 'app/theme/chromium',
1094 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1096 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1095 }, 1097 },
1096 }], 1098 }],
1097 ], 1099 ],
1098 } 1100 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/linux/debian/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698