diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 18:36:30 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 18:36:30 +0000 |
| commit | 03addade74464899a7e75256a773ce859930990f (patch) | |
| tree | fe022a7e492629d42ffafea4068296bb9633c812 /jingle | |
| parent | af275c58611add67b9fa1e6efa90733dc79c2303 (diff) | |
| download | chromium_src-03addade74464899a7e75256a773ce859930990f.zip chromium_src-03addade74464899a7e75256a773ce859930990f.tar.gz chromium_src-03addade74464899a7e75256a773ce859930990f.tar.bz2 | |
Build jingle targets when webrtc is enabled.
BUG=161417
Review URL: https://codereview.chromium.org/11570014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/jingle.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp index 25f869d..4a32b63 100644 --- a/jingle/jingle.gyp +++ b/jingle/jingle.gyp @@ -7,7 +7,7 @@ 'chromium_code': 1, }, # variables 'conditions': [ - ['OS != "ios" and OS != "android"', { + ['enable_webrtc==1 or (OS != "ios" and OS != "android")', { 'targets': [ # A library of various utils for integration with libjingle. { @@ -214,9 +214,9 @@ ], }, ], - }, { # OS == "ios" or OS == "android" + }, { # enable_webrtc != 1 and (OS == "ios" or OS == "android") 'targets': [ - # Stub targets as iOS/Android don't use libjingle. + # Stub targets as iOS/Android don't use libjingle when webrtc is disabled. { 'target_name': 'jingle_glue', 'type': 'none', |