diff options
| author | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 22:39:32 +0000 |
|---|---|---|
| committer | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 22:39:32 +0000 |
| commit | caa95c8a79b536d2fb023545484f13038e9db4a3 (patch) | |
| tree | e941cc796eddb42a8e5396c422addcf0b37944d9 /build | |
| parent | b4d2b5fe73d3ce5d0898a3f0b0640f8a84bb14aa (diff) | |
| download | chromium_src-caa95c8a79b536d2fb023545484f13038e9db4a3.zip chromium_src-caa95c8a79b536d2fb023545484f13038e9db4a3.tar.gz chromium_src-caa95c8a79b536d2fb023545484f13038e9db4a3.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32879 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 c34ff48..4a61b70 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -83,7 +83,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 612874c..7f3bc59 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -85,6 +85,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 |