From 4cc66139f28f574f81df4b2d191c8fe752b7f105 Mon Sep 17 00:00:00 2001 From: "msarda@chromium.org" Date: Mon, 8 Oct 2012 16:24:49 +0000 Subject: [PATCH] Do not build libjingle on iOS. Avoid building libjingle on iOS as it is not needed. Review URL: https://chromiumcodereview.appspot.com/11027018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160659 0039d316-1c4b-4281-b951-d872f2087c98 --- sync/sync.gyp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sync/sync.gyp b/sync/sync.gyp index 5fa64171a8ec..f216a297d132 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -254,7 +254,6 @@ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', # TODO(akalin): Remove this (http://crbug.com/133352). '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', - '../third_party/libjingle/libjingle.gyp:libjingle', 'sync', ], 'export_dependent_settings': [ @@ -296,9 +295,13 @@ 'notifier/sync_system_resources.h', ], }], + ['OS != "ios"', { + 'dependencies': [ + '../third_party/libjingle/libjingle.gyp:libjingle', + ], + }], ], }, - # The sync internal API library. { 'target_name': 'syncapi_core', @@ -654,7 +657,6 @@ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', - '../third_party/libjingle/libjingle.gyp:libjingle', 'sync', 'sync_notifier', 'test_support_sync_notifier', @@ -668,7 +670,6 @@ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', - '../third_party/libjingle/libjingle.gyp:libjingle', 'sync', 'sync_notifier', 'test_support_sync_notifier', @@ -696,6 +697,16 @@ }], ], }, + 'conditions': [ + ['OS != "ios"', { + 'dependencies': [ + '../third_party/libjingle/libjingle.gyp:libjingle', + ], + 'export_dependent_settings': [ + '../third_party/libjingle/libjingle.gyp:libjingle', + ], + }], + ], }, # Unit tests for the 'syncapi_core' target. This cannot be a static -- 2.11.4.GIT