diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-08 22:43:45 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-08 22:43:45 +0000 |
| commit | d67c9ea53b3b18b16e6664384fae814ad7d0e9c9 (patch) | |
| tree | a382768b23020e964222d47a07cebbe975ebb979 | |
| parent | 5133f61010993beed3aa7c10aad8106c267be9ee (diff) | |
| download | chromium_src-d67c9ea53b3b18b16e6664384fae814ad7d0e9c9.zip chromium_src-d67c9ea53b3b18b16e6664384fae814ad7d0e9c9.tar.gz chromium_src-d67c9ea53b3b18b16e6664384fae814ad7d0e9c9.tar.bz2 | |
Add chromoting option for gyp.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2745004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49201 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/all.gyp | 5 | ||||
| -rw-r--r-- | build/common.gypi | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp index bbb60b8..d6b331fa 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -125,6 +125,11 @@ '../chrome/browser/chromeos/text_input/text_input.gyp:*', ], }], + ['chromoting==1', { + 'dependencies': [ + '../remoting/chromoting.gyp:*', + ], + }], ], }, ], diff --git a/build/common.gypi b/build/common.gypi index 3228d13..a46ff74 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -109,6 +109,9 @@ # 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, }, # Define branding and buildtype on the basis of their settings within the @@ -127,6 +130,7 @@ 'arm_neon%': '<(arm_neon)', 'sysroot%': '<(sysroot)', 'disable_sse2%': '<(disable_sse2)', + 'chromoting%': '<(chromoting)', # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. |