diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 23:03:56 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 23:03:56 +0000 |
| commit | 7c10f36a7589d7d5c90706c1fc9ba34dc139b676 (patch) | |
| tree | ac83a823b056b0e4c9b3b5f5f679edcc91878772 /jingle/jingle.gyp | |
| parent | 3296c94949db9c4fe3dcf0830322c4da75bf7c7a (diff) | |
| download | chromium_src-7c10f36a7589d7d5c90706c1fc9ba34dc139b676.zip chromium_src-7c10f36a7589d7d5c90706c1fc9ba34dc139b676.tar.gz chromium_src-7c10f36a7589d7d5c90706c1fc9ba34dc139b676.tar.bz2 | |
Android: Remove depenendency on libjingle_p2p and jingle_glue.
BUG=155069
Review URL: https://chromiumcodereview.appspot.com/11308013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/jingle.gyp')
| -rw-r--r-- | jingle/jingle.gyp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp index 95a99ae..25f869d 100644 --- a/jingle/jingle.gyp +++ b/jingle/jingle.gyp @@ -7,7 +7,7 @@ 'chromium_code': 1, }, # variables 'conditions': [ - ['OS != "ios"', { + ['OS != "ios" and OS != "android"', { 'targets': [ # A library of various utils for integration with libjingle. { @@ -214,14 +214,18 @@ ], }, ], - }, { # OS == "ios" + }, { # OS == "ios" or OS == "android" 'targets': [ - # Stub targets as iOS doesn't use libjingle. + # Stub targets as iOS/Android don't use libjingle. { 'target_name': 'jingle_glue', 'type': 'none', }, { + 'target_name': 'jingle_glue_test_util', + 'type': 'none', + }, + { 'target_name': 'notifier', 'type': 'static_library', 'sources': [ |