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

Unified Diff: sync/sync.gyp

Issue 11360194: Bring up minimal sync and sync unittest targets on iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Response to review Created 8 years, 1 month 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 | « build/all.gyp ('k') | sync/util/get_session_name.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sync.gyp
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 3f75837037cd44ba1a397f346502f908df56cfbe..6172b843a8036f2d39ad59a04b4d9531229d99e6 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -222,6 +222,8 @@
'util/extensions_activity_monitor.h',
'util/get_session_name.cc',
'util/get_session_name.h',
+ 'util/get_session_name_ios.mm',
+ 'util/get_session_name_ios.h',
'util/get_session_name_mac.mm',
'util/get_session_name_mac.h',
'util/get_session_name_win.cc',
@@ -273,7 +275,12 @@
'notifier/object_id_invalidation_map.h',
],
'conditions': [
- ['OS != "android"', {
+ ['OS == "ios"', {
+ 'sources!': [
+ 'notifier/invalidator_factory.cc',
+ ],
+ }],
+ ['OS != "android" and OS != "ios"', {
'sources': [
'notifier/ack_tracker.cc',
'notifier/ack_tracker.h',
@@ -695,7 +702,15 @@
'notifier/invalidator_factory_unittest.cc',
],
'conditions': [
- ['OS != "android"', {
+ ['OS == "ios"', {
+ 'sources!': [
+ # TODO(ios): Re-enable this test on iOS once there is an iOS
+ # implementation of invalidator_factory.
+ 'notifier/invalidator_factory_unittest.cc',
+ 'notifier/sync_notifier_factory_unittest.cc',
+ ],
+ }],
+ ['OS != "android" and OS != "ios"', {
'sources': [
'notifier/ack_tracker_unittest.cc',
'notifier/fake_invalidator_unittest.cc',
@@ -773,6 +788,13 @@
'internal_api/sync_encryption_handler_impl_unittest.cc',
'internal_api/sync_manager_impl_unittest.cc',
],
+ 'conditions': [
+ ['OS == "ios"', {
+ 'sources!': [
+ 'internal_api/http_bridge_unittest.cc',
+ ],
+ }],
+ ],
},
},
« no previous file with comments | « build/all.gyp ('k') | sync/util/get_session_name.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698