diff options
| author | mostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-02 11:18:59 +0000 |
|---|---|---|
| committer | mostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-02 11:18:59 +0000 |
| commit | 7ab1107865a45ade8cacd6ca11cc5324943af1e0 (patch) | |
| tree | e20d6eea793526c5c6166ee49e81e196c9c25dfb /remoting/remoting_host.gypi | |
| parent | 855d7d572fb4d4aaf97464771661c6805e0347a5 (diff) | |
| download | chromium_src-7ab1107865a45ade8cacd6ca11cc5324943af1e0.zip chromium_src-7ab1107865a45ade8cacd6ca11cc5324943af1e0.tar.gz chromium_src-7ab1107865a45ade8cacd6ca11cc5324943af1e0.tar.bz2 | |
webrtc deps in remoting should be inside a webrtc condition
If you try to build with enable_webrtc=0 and remoting=1, gyp will fail:
libjingle.gyp:libpeerconnection#target' when processing
remoting.gyp:remoting_host#target. This happens because the
libpeerconnnection target is defined inside an enable_webrtc==1 condition.
Therefore, these dependencies in remoting.gyp should be too.
BUG=399413
Review URL: https://codereview.chromium.org/431163002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting_host.gypi')
| -rw-r--r-- | remoting/remoting_host.gypi | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi index e08b1c2..725286f 100644 --- a/remoting/remoting_host.gypi +++ b/remoting/remoting_host.gypi @@ -39,8 +39,6 @@ '../crypto/crypto.gyp:crypto', '../google_apis/google_apis.gyp:google_apis', '../ipc/ipc.gyp:ipc', - '../third_party/webrtc/modules/modules.gyp:desktop_capture', - '../third_party/libjingle/libjingle.gyp:libpeerconnection', '../ui/events/events.gyp:dom4_keycode_converter', ], 'defines': [ @@ -357,6 +355,12 @@ 'message': 'Running message compiler on <(RULE_INPUT_PATH)', }], }], + ['enable_webrtc==1', { + 'dependencies': [ + '../third_party/webrtc/modules/modules.gyp:desktop_capture', + '../third_party/libjingle/libjingle.gyp:libpeerconnection', + ], + }], ], }, # end of target 'remoting_host' |