diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 21:33:00 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 21:33:00 +0000 |
| commit | 6040af94afce8f5953b8c19c5258a6d8be122152 (patch) | |
| tree | 4b5ac1a229555694d24103633386b192d8132594 /jingle | |
| parent | ea91a2bf8536adfed57c70d56df741dbd8aeb8d2 (diff) | |
| download | chromium_src-6040af94afce8f5953b8c19c5258a6d8be122152.zip chromium_src-6040af94afce8f5953b8c19c5258a6d8be122152.tar.gz chromium_src-6040af94afce8f5953b8c19c5258a6d8be122152.tar.bz2 | |
Makes the necessary changes to sync.gyp as well as its dependencies (most notably jingle) in order to bring up the complete sync_notifier target on iOS.
TBR=thakis
Review URL: https://chromiumcodereview.appspot.com/12041016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178650 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 8b64fe5..0fd9811 100644 --- a/jingle/jingle.gyp +++ b/jingle/jingle.gyp @@ -7,7 +7,7 @@ 'chromium_code': 1, }, # variables 'conditions': [ - ['enable_webrtc==1 or (OS != "ios" and OS != "android")', { + ['enable_webrtc==1 or OS!="android"', { 'targets': [ # A library of various utils for integration with libjingle. { @@ -213,9 +213,9 @@ ], }, ], - }, { # enable_webrtc != 1 and (OS == "ios" or OS == "android") + }, { # enable_webrtc!=1 and OS=="android" 'targets': [ - # Stub targets as iOS/Android don't use libjingle when webrtc is disabled. + # Stub targets as Android doesn't use libjingle when webrtc is disabled. { 'target_name': 'jingle_glue', 'type': 'none', |