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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 1321573006: Remove env var dep from linux packaging. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes Created 5 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
« 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 'branding_dir': 'app/theme/<(branding_path_component)', 8 'branding_dir': 'app/theme/<(branding_path_component)',
9 'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component )', 9 'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component )',
10 }, 10 },
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 '<(PRODUCT_DIR)/locales/en-US.pak', 452 '<(PRODUCT_DIR)/locales/en-US.pak',
453 '<(PRODUCT_DIR)/nacl_helper', 453 '<(PRODUCT_DIR)/nacl_helper',
454 '<(PRODUCT_DIR)/nacl_helper_bootstrap', 454 '<(PRODUCT_DIR)/nacl_helper_bootstrap',
455 '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so', 455 '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so',
456 '<(PRODUCT_DIR)/PepperFlash/manifest.json', 456 '<(PRODUCT_DIR)/PepperFlash/manifest.json',
457 '<@(default_apps_list_linux_dest)', 457 '<@(default_apps_list_linux_dest)',
458 ], 458 ],
459 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'], 459 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'],
460 'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh', 460 'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh',
461 'rpm_build': '<(PRODUCT_DIR)/installer/rpm/build.sh', 461 'rpm_build': '<(PRODUCT_DIR)/installer/rpm/build.sh',
462 # The script expects either "google_chrome" or "chromium" for -d,
463 # which is also what branding_path_component contains.
462 'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)', 464 'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)',
463 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], 465 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)',
466 '-d', '<(branding_path_component)'],
464 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)', 467 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)',
465 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], 468 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)',
469 '-d', '<(branding_path_component)'],
466 'conditions': [ 470 'conditions': [
467 ['target_arch=="ia32"', { 471 ['target_arch=="ia32"', {
468 'deb_arch': 'i386', 472 'deb_arch': 'i386',
469 'rpm_arch': 'i386', 473 'rpm_arch': 'i386',
470 'packaging_files_binaries': [ 474 'packaging_files_binaries': [
471 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 475 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
472 '<(PRODUCT_DIR)/libwidevinecdmadapter.so', 476 '<(PRODUCT_DIR)/libwidevinecdmadapter.so',
473 '<(PRODUCT_DIR)/libwidevinecdm.so', 477 '<(PRODUCT_DIR)/libwidevinecdm.so',
474 ], 478 ],
475 'packaging_files_common': [ 479 'packaging_files_common': [
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
1097 '../build/isolate.gypi', 1101 '../build/isolate.gypi',
1098 ], 1102 ],
1099 'sources': [ 1103 'sources': [
1100 'setup_unittests.isolate', 1104 'setup_unittests.isolate',
1101 ], 1105 ],
1102 }, 1106 },
1103 ], 1107 ],
1104 }], 1108 }],
1105 ], 1109 ],
1106 } 1110 }
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