From ceddb86ca202d5b1ae357f02d4a26b44933edf22 Mon Sep 17 00:00:00 2001 From: "msarda@chromium.org" Date: Tue, 25 Sep 2012 13:01:57 +0000 Subject: [PATCH] Do not build sync command line tools on iOS. Exclude the sync command line tools on iOS as they cannot be built. Review URL: https://chromiumcodereview.appspot.com/10970068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158551 0039d316-1c4b-4281-b951-d872f2087c98 --- sync/sync.gyp | 79 +++++++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/sync/sync.gyp b/sync/sync.gyp index cdbbd16c0ca2..96ccfcc363d2 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -826,46 +826,49 @@ }], ], }, - - # A tool to listen to sync notifications and print them out. - { - 'target_name': 'sync_listen_notifications', - 'type': 'executable', - 'dependencies': [ - '../base/base.gyp:base', - '../jingle/jingle.gyp:notifier', - '../net/net.gyp:net', - '../net/net.gyp:net_test_support', - 'sync', - 'sync_notifier', - ], - 'sources': [ - 'tools/sync_listen_notifications.cc', - ], - }, - - # A standalone command-line sync client. - { - 'target_name': 'sync_client', - 'type': 'executable', - 'defines': [ - 'SYNC_TEST', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../jingle/jingle.gyp:notifier', - '../net/net.gyp:net', - '../net/net.gyp:net_test_support', - 'sync', - 'sync_notifier', - 'syncapi_core', - ], - 'sources': [ - 'tools/sync_client.cc', - ], - }, ], 'conditions': [ + ['OS != "ios"', { + 'targets': [ + # A tool to listen to sync notifications and print them out. + { + 'target_name': 'sync_listen_notifications', + 'type': 'executable', + 'dependencies': [ + '../base/base.gyp:base', + '../jingle/jingle.gyp:notifier', + '../net/net.gyp:net', + '../net/net.gyp:net_test_support', + 'sync', + 'sync_notifier', + ], + 'sources': [ + 'tools/sync_listen_notifications.cc', + ], + }, + + # A standalone command-line sync client. + { + 'target_name': 'sync_client', + 'type': 'executable', + 'defines': [ + 'SYNC_TEST', + ], + 'dependencies': [ + '../base/base.gyp:base', + '../jingle/jingle.gyp:notifier', + '../net/net.gyp:net', + '../net/net.gyp:net_test_support', + 'sync', + 'sync_notifier', + 'syncapi_core', + ], + 'sources': [ + 'tools/sync_client.cc', + ], + }, + ], + }], # Special target to wrap a gtest_target_type==shared_library # sync_unit_tests into an android apk for execution. ['OS == "android" and gtest_target_type == "shared_library"', { -- 2.11.4.GIT