diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 00:39:00 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 00:39:00 +0000 |
| commit | c0bac53df6ffdd2bf29a8ec561429dfdd9ff39f5 (patch) | |
| tree | 6fc56f8e45362ea47bdadabf68e05577de327d1b /build | |
| parent | f172b98916ab59ae666ebda2c94d1cb2fc542f01 (diff) | |
| download | chromium_src-c0bac53df6ffdd2bf29a8ec561429dfdd9ff39f5.zip chromium_src-c0bac53df6ffdd2bf29a8ec561429dfdd9ff39f5.tar.gz chromium_src-c0bac53df6ffdd2bf29a8ec561429dfdd9ff39f5.tar.bz2 | |
Enable chromoting in the build by default
Set chromoting to be built by default. Also defines a ENABLE_CHROMOTING flag
if chromoting is enabled in the build system so we can exclude chromoting
if we don't want chromoting code to be linked in.
Review URL: http://codereview.chromium.org/2788003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 0276b10..07f0614 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -110,8 +110,8 @@ # On Linux, we build with sse2 for Chromium builds. 'disable_sse2%': 0, - # Chromoting compilation is disabled by default. Set to 1 to enable. - 'chromoting%': 0, + # Chromoting compilation is enabled by default. Set to 0 to disable. + 'chromoting%': 1, }, # Define branding and buildtype on the basis of their settings within the @@ -408,6 +408,9 @@ ['chromeos==1', { 'defines': ['OS_CHROMEOS=1'], }], + ['chromoting==1', { + 'defines': ['ENABLE_CHROMOTING=1'], + }], ['proprietary_codecs==1', { 'defines': ['USE_PROPRIETARY_CODECS'], }], |