diff options
| author | mal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-24 09:59:05 +0000 |
|---|---|---|
| committer | mal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-24 09:59:05 +0000 |
| commit | 01b897429526efc1b6f82e1cea4d3695568239c1 (patch) | |
| tree | 278060789a7d133eae81f3ebdc231b38aed0e8ea /build | |
| parent | b0c6ad6c7328fb0dfe4f63bb89e2f15344987352 (diff) | |
| download | chromium_src-01b897429526efc1b6f82e1cea4d3695568239c1.zip chromium_src-01b897429526efc1b6f82e1cea4d3695568239c1.tar.gz chromium_src-01b897429526efc1b6f82e1cea4d3695568239c1.tar.bz2 | |
Merge 32879 - Make Linux packaging options more granular.
This allows us to not waste time building packages/channels we don't care about. Also added option to build new 'trunk' channel packages, which are a special configuration for developer testing.
Review URL: http://codereview.chromium.org/418021
TBR=mmoss@chromium.org
Review URL: http://codereview.chromium.org/438016
git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@32920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/common.gypi | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index 0a386ea..85c7c2c 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -82,7 +82,7 @@ 'conditions': [ ['branding=="Chrome"', { 'dependencies': [ - '../chrome/installer/installer.gyp:linux_packages', + '../chrome/installer/installer.gyp:linux_packages_<(channel)', ], }], ], diff --git a/build/common.gypi b/build/common.gypi index be89cdd..164e338 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -84,6 +84,11 @@ 'inside_chromium_build%': '<(inside_chromium_build)', 'fastbuild%': '<(fastbuild)', + # The release channel that this build targets. This is used to restrict + # channel-specific build options, like which installer packages to create. + # The default is 'all', which does no channel-specific filtering. + 'channel%': 'all', + # Override chromium_mac_pch and set it to 0 to suppress the use of # precompiled headers on the Mac. Prefix header injection may still be # used, but prefix headers will not be precompiled. This is useful when |