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

Unified 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, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/installer/linux/debian/build.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_installer.gypi
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index 9c9a8dca86ac5c74add5efb78e4aae3517503d46..6ed6062837e8d79999cd5e718550041caa3962ff 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -459,10 +459,14 @@
'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'],
'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh',
'rpm_build': '<(PRODUCT_DIR)/installer/rpm/build.sh',
+ # The script expects either "google_chrome" or "chromium" for -d,
+ # which is also what branding_path_component contains.
'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)',
- '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'],
+ '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)',
+ '-d', '<(branding_path_component)'],
'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)',
- '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'],
+ '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)',
+ '-d', '<(branding_path_component)'],
'conditions': [
['target_arch=="ia32"', {
'deb_arch': 'i386',
« 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