diff options
| author | brettw <brettw@chromium.org> | 2015-08-28 12:04:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-28 19:05:15 +0000 |
| commit | c5ecd7ddc1a1f5a6ee104ea2ffffb82a0db288b7 (patch) | |
| tree | d368af67b1bd96f3ede545159382cbb20a4507ca /chrome/chrome_installer.gypi | |
| parent | ebf25e89c6aa129140e82e7fa632d1d0299302a6 (diff) | |
| download | chromium_src-c5ecd7ddc1a1f5a6ee104ea2ffffb82a0db288b7.zip chromium_src-c5ecd7ddc1a1f5a6ee104ea2ffffb82a0db288b7.tar.gz chromium_src-c5ecd7ddc1a1f5a6ee104ea2ffffb82a0db288b7.tar.bz2 | |
Remove env var dep from linux packaging.
The RPM and DEB packaging scripts expect the environment variable
CHROMIUM_BUILD to be set. The build fails mysteriously if this isn't set.
This change passes through a string from the gyp build to avoid this.
Review URL: https://codereview.chromium.org/1321573006
Cr-Commit-Position: refs/heads/master@{#346201}
Diffstat (limited to 'chrome/chrome_installer.gypi')
| -rw-r--r-- | chrome/chrome_installer.gypi | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 9c9a8dc..6ed6062 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', |