diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 01:01:29 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 01:01:29 +0000 |
| commit | 9eac0d2da1028a20da3d168ee192bb94a19b65cf (patch) | |
| tree | df666618a9ff3d9818098495bbbe79c969af48b6 /third_party | |
| parent | 6990e4e02b98a3d5b9469483173c54609317c763 (diff) | |
| download | chromium_src-9eac0d2da1028a20da3d168ee192bb94a19b65cf.zip chromium_src-9eac0d2da1028a20da3d168ee192bb94a19b65cf.tar.gz chromium_src-9eac0d2da1028a20da3d168ee192bb94a19b65cf.tar.bz2 | |
Android libjingle work.
BUG=None
TEST=
Review URL: http://codereview.chromium.org/9235038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 49 |
1 files changed, 35 insertions, 14 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 916ca84..7a5b50e 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -82,6 +82,11 @@ 'OSX', ], }], + ['OS=="android"', { + 'defines': [ + 'ANDROID', + ], + }], ['os_posix == 1', { 'defines': [ 'POSIX', @@ -330,6 +335,12 @@ 'source/talk/xmpp/xmpptask.cc', 'source/talk/xmpp/xmpptask.h', ], + 'dependencies': [ + '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', + ], + 'export_dependent_settings': [ + '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', + ], 'conditions': [ ['OS=="win"', { 'sources': [ @@ -373,12 +384,17 @@ 'source/talk/base/macutils.h', ], }], - ], - 'dependencies': [ - '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', - ], - 'export_dependent_settings': [ - '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', + ['OS=="android"', { + 'sources!': [ + # These depend on jsoncpp which we don't load because we probably + # don't actually need this code at all. + 'source/talk/base/json.cc', + 'source/talk/base/json.h', + ], + 'dependencies!': [ + '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', + ], + }], ], }, # target libjingle # This has to be is a separate project due to a bug in MSVS: @@ -533,14 +549,19 @@ 'source/talk/session/phone/webrtcvoiceengine.cc', 'source/talk/session/phone/webrtcvoiceengine.h', ], - 'dependencies': [ - '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module', - '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module', - '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_core', - '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core', - '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers', - 'libjingle', - 'libjingle_p2p', + 'conditions': [ + ['OS!="android"', { + 'dependencies': [ + # We won't build with WebRTC on Android. + '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module', + '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module', + '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_core', + '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core', + '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers', + 'libjingle', + 'libjingle_p2p', + ], + }], ], }, # target libjingle_peerconnection ], |