Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(961)

Unified Diff: jingle/jingle.gyp

Issue 11308013: Android: Remove depenendency on libjingle_p2p and jingle_glue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_renderer.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/jingle.gyp
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
index b1270b65cd015aad79fe229e748e377794343e75..cf655b5dbcde7c3a36da28d0dff81b31b1e683a8 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.
{
@@ -211,14 +211,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': [
« no previous file with comments | « content/content_renderer.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698