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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/chrome.gyp

Issue 337034: Remove the browser_sync flag. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/views/toolbar_view.cc ('k') | chrome/test/live_sync/bookmark_model_verifier.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'variables': { 9 'variables': {
10 'version_py_path': 'tools/build/version.py', 10 'version_py_path': 'tools/build/version.py',
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 'views_unit_tests_sources': [ 120 'views_unit_tests_sources': [
121 '../views/view_unittest.cc', 121 '../views/view_unittest.cc',
122 '../views/focus/focus_manager_unittest.cc', 122 '../views/focus/focus_manager_unittest.cc',
123 '../views/controls/label_unittest.cc', 123 '../views/controls/label_unittest.cc',
124 ], 124 ],
125 'views_unit_tests_sources_win_specific': [ 125 'views_unit_tests_sources_win_specific': [
126 # TODO(jcampan): make the following tests work on Linux. 126 # TODO(jcampan): make the following tests work on Linux.
127 '../views/controls/table/table_view_unittest.cc', 127 '../views/controls/table/table_view_unittest.cc',
128 '../views/grid_layout_unittest.cc', 128 '../views/grid_layout_unittest.cc',
129 ], 129 ],
130 'browser_sync%': 1,
131 'conditions': [ 130 'conditions': [
132 ['OS=="win"', { 131 ['OS=="win"', {
133 'nacl_defines': [ 132 'nacl_defines': [
134 'NACL_WINDOWS=1', 133 'NACL_WINDOWS=1',
135 'NACL_LINUX=0', 134 'NACL_LINUX=0',
136 'NACL_OSX=0', 135 'NACL_OSX=0',
137 ], 136 ],
138 },], 137 },],
139 ['OS=="linux"', { 138 ['OS=="linux"', {
140 'nacl_defines': [ 139 'nacl_defines': [
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 ], 197 ],
199 }], 198 }],
200 ['OS=="win"', {'sources/': [ 199 ['OS=="win"', {'sources/': [
201 ['include', '_(views|win)(_unittest)?\\.cc$'], 200 ['include', '_(views|win)(_unittest)?\\.cc$'],
202 ['include', '/win/'], 201 ['include', '/win/'],
203 ['include', '/(views|win)_[^/]*\\.cc$'], 202 ['include', '/(views|win)_[^/]*\\.cc$'],
204 ]}], 203 ]}],
205 ['OS=="linux" and toolkit_views==1', {'sources/': [ 204 ['OS=="linux" and toolkit_views==1', {'sources/': [
206 ['include', '_views\\.cc$'], 205 ['include', '_views\\.cc$'],
207 ]}], 206 ]}],
208 ['browser_sync==0', {'sources/': [
209 ['exclude', '^(browser/sync|browser/views/sync).*cc$'],
210 ]}, {'defines': [
211 'BROWSER_SYNC=1',
212 ]}],
213 ], 207 ],
214 }, 208 },
215 'targets': [ 209 'targets': [
216 { 210 {
217 # TODO(mark): It would be better if each static library that needed 211 # TODO(mark): It would be better if each static library that needed
218 # to run grit would list its own .grd files, but unfortunately some 212 # to run grit would list its own .grd files, but unfortunately some
219 # of the static libraries currently have circular dependencies among 213 # of the static libraries currently have circular dependencies among
220 # generated headers. 214 # generated headers.
221 'target_name': 'chrome_resources', 215 'target_name': 'chrome_resources',
222 'type': 'none', 216 'type': 'none',
(...skipping 2762 matching lines...) Expand 10 before | Expand all | Expand 10 after
2985 'browser/tab_contents/web_drag_source.cc', 2979 'browser/tab_contents/web_drag_source.cc',
2986 'browser/tab_contents/web_drop_target.cc', 2980 'browser/tab_contents/web_drop_target.cc',
2987 ], 2981 ],
2988 }], 2982 }],
2989 # views depends on webkit headers. 2983 # views depends on webkit headers.
2990 ['OS=="win" or toolkit_views==1',{ 2984 ['OS=="win" or toolkit_views==1',{
2991 'dependencies': [ 2985 'dependencies': [
2992 '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', 2986 '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
2993 ], 2987 ],
2994 }], 2988 }],
2995 ['OS=="linux" and browser_sync==1', { 2989 ['OS=="linux"', {
2996 'sources': [ 2990 'sources': [
2997 'browser/gtk/sync_setup_wizard_gtk.cc', 2991 'browser/gtk/sync_setup_wizard_gtk.cc',
2998 'browser/gtk/sync_setup_wizard_gtk.h', 2992 'browser/gtk/sync_setup_wizard_gtk.h',
2999 ], 2993 ],
3000 }], 2994 }],
3001 ], 2995 ],
3002 }, 2996 },
3003 { 2997 {
3004 'target_name': 'debugger', 2998 'target_name': 'debugger',
3005 'type': '<(library)', 2999 'type': '<(library)',
(...skipping 1906 matching lines...) Expand 10 before | Expand all | Expand 10 after
4912 'dependencies': [ 4906 'dependencies': [
4913 '../build/linux/system.gyp:gtk', 4907 '../build/linux/system.gyp:gtk',
4914 ], 4908 ],
4915 },], 4909 },],
4916 ], 4910 ],
4917 }, 4911 },
4918 { 4912 {
4919 # Provides a syncapi dynamic library target from checked-in binaries, 4913 # Provides a syncapi dynamic library target from checked-in binaries,
4920 # or from compiling a stub implementation. 4914 # or from compiling a stub implementation.
4921 'target_name': 'syncapi', 4915 'target_name': 'syncapi',
4922 4916 'type': '<(library)',
4923 'conditions': [ 4917 'sources': [
4924 ['browser_sync==0', { 4918 'browser/sync/engine/syncapi.cc',
4925 # Empty target. 4919 ],
4926 'type': 'none', 4920 'include_dirs': [
4927 }, { 4921 '..',
4928 # Build sync. 4922 '<(protoc_out_dir)',
4929 'type': '<(library)', 4923 ],
4930 'sources': [ 4924 'defines' : [
4931 'browser/sync/engine/syncapi.cc', 4925 '_CRT_SECURE_NO_WARNINGS',
4932 ], 4926 '_USE_32BIT_TIME_T',
4933 'include_dirs': [ 4927 ],
4934 '..', 4928 'dependencies': [
4935 '<(protoc_out_dir)', 4929 '../base/base.gyp:base',
4936 ], 4930 '../build/temp_gyp/googleurl.gyp:googleurl',
4937 'defines' : [ 4931 '../net/net.gyp:net_base',
4938 '_CRT_SECURE_NO_WARNINGS', 4932 '../third_party/icu/icu.gyp:icuuc',
4939 '_USE_32BIT_TIME_T', 4933 '../third_party/libjingle/libjingle.gyp:libjingle',
4940 ], 4934 '../third_party/sqlite/sqlite.gyp:sqlite',
4941 'dependencies': [ 4935 'common_constants',
4942 '../base/base.gyp:base', 4936 'notifier',
4943 '../build/temp_gyp/googleurl.gyp:googleurl', 4937 'sync',
4944 '../net/net.gyp:net_base', 4938 'sync_proto',
4945 '../third_party/icu/icu.gyp:icuuc',
4946 '../third_party/libjingle/libjingle.gyp:libjingle',
4947 '../third_party/sqlite/sqlite.gyp:sqlite',
4948 'common_constants',
4949 'notifier',
4950 'sync',
4951 'sync_proto',
4952 ],
4953 }],
4954 ], 4939 ],
4955 }, 4940 },
4956 { 4941 {
4957 'target_name': 'page_cycler_tests', 4942 'target_name': 'page_cycler_tests',
4958 'type': 'executable', 4943 'type': 'executable',
4959 'msvs_guid': 'C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7', 4944 'msvs_guid': 'C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7',
4960 'dependencies': [ 4945 'dependencies': [
4961 'chrome', 4946 'chrome',
4962 'chrome_resources', 4947 'chrome_resources',
4963 'chrome_strings', 4948 'chrome_strings',
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
5077 ['OS=="win"', { 5062 ['OS=="win"', {
5078 'include_dirs': [ 5063 'include_dirs': [
5079 'third_party/wtl/include', 5064 'third_party/wtl/include',
5080 ], 5065 ],
5081 'dependencies': [ 5066 'dependencies': [
5082 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', 5067 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
5083 ], 5068 ],
5084 }], # OS="win" 5069 }], # OS="win"
5085 ], # conditions 5070 ], # conditions
5086 }, 5071 },
5072 {
5073 # Protobuf compiler / generate rule for sync.proto
5074 'target_name': 'sync_proto',
5075 'type': 'none',
5076 'actions': [
5077 {
5078 'action_name': 'compiling sync.proto',
5079 'inputs': [
5080 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
5081 'browser/sync/protocol/sync.proto',
5082 ],
5083 'outputs': [
5084 '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.cc',
5085 '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.h',
5086 ],
5087 'action': [
5088 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
5089 '--proto_path=browser/sync/protocol',
5090 'browser/sync/protocol/sync.proto',
5091 '--cpp_out=<(protoc_out_dir)/chrome/browser/sync/protocol',
5092 ],
5093 },
5094 ],
5095 'dependencies': [
5096 '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
5097 '../third_party/protobuf2/protobuf.gyp:protoc',
5098 ],
5099 'export_dependent_settings': [
5100 '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
5101 ],
5102 },
5103 {
5104 'target_name': 'notifier',
5105 'type': '<(library)',
5106 'sources': [
5107 'browser/sync/notifier/base/async_dns_lookup.cc',
5108 'browser/sync/notifier/base/async_dns_lookup.h',
5109 'browser/sync/notifier/base/async_network_alive.h',
5110 'browser/sync/notifier/base/fastalloc.h',
5111 'browser/sync/notifier/base/linux/network_status_detector_task_linux.cc' ,
5112 'browser/sync/notifier/base/linux/time_linux.cc',
5113 'browser/sync/notifier/base/mac/network_status_detector_task_mac.cc',
5114 'browser/sync/notifier/base/mac/time_mac.cc',
5115 'browser/sync/notifier/base/nethelpers.cc',
5116 'browser/sync/notifier/base/nethelpers.h',
5117 'browser/sync/notifier/base/network_status_detector_task.cc',
5118 'browser/sync/notifier/base/network_status_detector_task.h',
5119 'browser/sync/notifier/base/network_status_detector_task_mt.cc',
5120 'browser/sync/notifier/base/network_status_detector_task_mt.h',
5121 'browser/sync/notifier/base/posix/time_posix.cc',
5122 'browser/sync/notifier/base/signal_thread_task.h',
5123 'browser/sync/notifier/base/static_assert.h',
5124 'browser/sync/notifier/base/task_pump.cc',
5125 'browser/sync/notifier/base/task_pump.h',
5126 'browser/sync/notifier/base/time.cc',
5127 'browser/sync/notifier/base/time.h',
5128 'browser/sync/notifier/base/timer.cc',
5129 'browser/sync/notifier/base/timer.h',
5130 'browser/sync/notifier/base/utils.h',
5131 'browser/sync/notifier/base/win/async_network_alive_win32.cc',
5132 'browser/sync/notifier/base/win/time_win32.cc',
5133 'browser/sync/notifier/communicator/auth_task.cc',
5134 'browser/sync/notifier/communicator/auth_task.h',
5135 'browser/sync/notifier/communicator/auto_reconnect.cc',
5136 'browser/sync/notifier/communicator/auto_reconnect.h',
5137 'browser/sync/notifier/communicator/connection_options.cc',
5138 'browser/sync/notifier/communicator/connection_options.h',
5139 'browser/sync/notifier/communicator/connection_settings.cc',
5140 'browser/sync/notifier/communicator/connection_settings.h',
5141 'browser/sync/notifier/communicator/const_communicator.h',
5142 'browser/sync/notifier/communicator/login.cc',
5143 'browser/sync/notifier/communicator/login.h',
5144 'browser/sync/notifier/communicator/login_failure.cc',
5145 'browser/sync/notifier/communicator/login_failure.h',
5146 'browser/sync/notifier/communicator/login_settings.cc',
5147 'browser/sync/notifier/communicator/login_settings.h',
5148 'browser/sync/notifier/communicator/product_info.cc',
5149 'browser/sync/notifier/communicator/product_info.h',
5150 'browser/sync/notifier/communicator/single_login_attempt.cc',
5151 'browser/sync/notifier/communicator/single_login_attempt.h',
5152 'browser/sync/notifier/communicator/ssl_socket_adapter.cc',
5153 'browser/sync/notifier/communicator/ssl_socket_adapter.h',
5154 'browser/sync/notifier/communicator/talk_auth_task.cc',
5155 'browser/sync/notifier/communicator/talk_auth_task.h',
5156 'browser/sync/notifier/communicator/xmpp_connection_generator.cc',
5157 'browser/sync/notifier/communicator/xmpp_connection_generator.h',
5158 'browser/sync/notifier/communicator/xmpp_log.cc',
5159 'browser/sync/notifier/communicator/xmpp_log.h',
5160 'browser/sync/notifier/communicator/xmpp_socket_adapter.cc',
5161 'browser/sync/notifier/communicator/xmpp_socket_adapter.h',
5162 'browser/sync/notifier/gaia_auth/gaiaauth.cc',
5163 'browser/sync/notifier/gaia_auth/gaiaauth.h',
5164 'browser/sync/notifier/gaia_auth/gaiahelper.cc',
5165 'browser/sync/notifier/gaia_auth/gaiahelper.h',
5166 'browser/sync/notifier/gaia_auth/inet_aton.h',
5167 'browser/sync/notifier/gaia_auth/sigslotrepeater.h',
5168 'browser/sync/notifier/gaia_auth/win/win32window.cc',
5169 'browser/sync/notifier/listener/listen_task.cc',
5170 'browser/sync/notifier/listener/listen_task.h',
5171 'browser/sync/notifier/listener/mediator_thread.h',
5172 'browser/sync/notifier/listener/mediator_thread_impl.cc',
5173 'browser/sync/notifier/listener/mediator_thread_impl.h',
5174 'browser/sync/notifier/listener/mediator_thread_mock.h',
5175 'browser/sync/notifier/listener/send_update_task.cc',
5176 'browser/sync/notifier/listener/send_update_task.h',
5177 'browser/sync/notifier/listener/subscribe_task.cc',
5178 'browser/sync/notifier/listener/subscribe_task.h',
5179 'browser/sync/notifier/listener/talk_mediator.h',
5180 'browser/sync/notifier/listener/talk_mediator_impl.cc',
5181 'browser/sync/notifier/listener/talk_mediator_impl.h',
5182 ],
5183 'include_dirs': [
5184 '..',
5185 '<(protoc_out_dir)',
5186 ],
5187 'defines' : [
5188 '_CRT_SECURE_NO_WARNINGS',
5189 '_USE_32BIT_TIME_T',
5190 'kXmppProductName="chromium-sync"',
5191 ],
5192 'dependencies': [
5193 '../third_party/expat/expat.gyp:expat',
5194 '../third_party/libjingle/libjingle.gyp:libjingle',
5195 'sync_proto',
5196 ],
5197 'conditions': [
5198 ['OS=="linux"', {
5199 'defines': [
5200 'POSIX',
5201 'OS_LINUX',
5202 ],
5203 'dependencies': [
5204 '../build/linux/system.gyp:gtk'
5205 ],
5206 }],
5207 ],
5208 },
5209 {
5210 'target_name': 'sync_unit_tests',
5211 'type': 'executable',
5212 'sources': [
5213 'browser/sync/engine/all_status_unittest.cc',
5214 'browser/sync/engine/apply_updates_command_unittest.cc',
5215 'browser/sync/engine/auth_watcher_unittest.cc',
5216 'browser/sync/engine/net/gaia_authenticator_unittest.cc',
5217 'browser/sync/engine/syncer_proto_util_unittest.cc',
5218 'browser/sync/engine/syncer_thread_unittest.cc',
5219 'browser/sync/engine/syncer_unittest.cc',
5220 'browser/sync/engine/syncproto_unittest.cc',
5221 'browser/sync/notifier/listener/talk_mediator_unittest.cc',
5222 'browser/sync/syncable/syncable_id_unittest.cc',
5223 'browser/sync/syncable/syncable_unittest.cc',
5224 'browser/sync/util/character_set_converters_unittest.cc',
5225 'browser/sync/util/crypto_helpers_unittest.cc',
5226 'browser/sync/util/event_sys_unittest.cc',
5227 'browser/sync/util/highres_timer_unittest.cc',
5228 'browser/sync/util/path_helpers_unittest.cc',
5229 'browser/sync/util/query_helpers_unittest.cc',
5230 'browser/sync/util/user_settings_unittest.cc',
5231 'test/sync/engine/mock_gaia_authenticator.cc',
5232 'test/sync/engine/mock_gaia_authenticator.h',
5233 'test/sync/engine/mock_gaia_authenticator_unittest.cc',
5234 'test/sync/engine/mock_server_connection.cc',
5235 'test/sync/engine/mock_server_connection.h',
5236 'test/sync/engine/test_directory_setter_upper.cc',
5237 'test/sync/engine/test_directory_setter_upper.h',
5238 'test/sync/engine/test_id_factory.h',
5239 ],
5240 'include_dirs': [
5241 '..',
5242 '<(protoc_out_dir)',
5243 ],
5244 'defines' : [
5245 'SYNC_ENGINE_VERSION_STRING="Unknown"',
5246 '_CRT_SECURE_NO_WARNINGS',
5247 '_USE_32BIT_TIME_T',
5248 ],
5249 'dependencies': [
5250 '../testing/gtest.gyp:gtest',
5251 '../third_party/libjingle/libjingle.gyp:libjingle',
5252 'notifier',
5253 'sync',
5254 'sync_proto',
5255 'test_support_unit',
5256 ],
5257 'conditions': [
5258 ['OS=="win"', {
5259 'sources' : [
5260 'browser/sync/util/data_encryption_unittest.cc',
5261 ],
5262 'dependencies': [
5263 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
5264 ],
5265 'link_settings': {
5266 'libraries': [
5267 '-lcrypt32.lib',
5268 '-lws2_32.lib',
5269 '-lsecur32.lib',
5270 ],
5271 },
5272 }, { # else: OS != "win"
5273 'sources!': [
5274 'browser/sync/util/data_encryption_unittest.cc',
5275 ],
5276 }],
5277 ['OS=="linux"', {
5278 'defines': [
5279 'POSIX',
5280 ],
5281 'dependencies': [
5282 '../build/linux/system.gyp:gtk'
5283 ],
5284 }],
5285 ],
5286 },
5287 {
5288 'target_name': 'sync',
5289 'type': '<(library)',
5290 'sources': [
5291 '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.cc',
5292 '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.h',
5293 'browser/sync/engine/all_status.cc',
5294 'browser/sync/engine/all_status.h',
5295 'browser/sync/engine/apply_updates_command.cc',
5296 'browser/sync/engine/apply_updates_command.h',
5297 'browser/sync/engine/auth_watcher.cc',
5298 'browser/sync/engine/auth_watcher.h',
5299 'browser/sync/engine/authenticator.cc',
5300 'browser/sync/engine/authenticator.h',
5301 'browser/sync/engine/build_and_process_conflict_sets_command.cc',
5302 'browser/sync/engine/build_and_process_conflict_sets_command.h',
5303 'browser/sync/engine/build_commit_command.cc',
5304 'browser/sync/engine/build_commit_command.h',
5305 'browser/sync/engine/change_reorder_buffer.cc',
5306 'browser/sync/engine/change_reorder_buffer.h',
5307 'browser/sync/engine/client_command_channel.h',
5308 'browser/sync/engine/conflict_resolution_view.cc',
5309 'browser/sync/engine/conflict_resolution_view.h',
5310 'browser/sync/engine/conflict_resolver.cc',
5311 'browser/sync/engine/conflict_resolver.h',
5312 'browser/sync/engine/download_updates_command.cc',
5313 'browser/sync/engine/download_updates_command.h',
5314 'browser/sync/engine/get_commit_ids_command.cc',
5315 'browser/sync/engine/get_commit_ids_command.h',
5316 'browser/sync/engine/model_changing_syncer_command.cc',
5317 'browser/sync/engine/model_changing_syncer_command.h',
5318 'browser/sync/engine/model_safe_worker.h',
5319 'browser/sync/engine/net/gaia_authenticator.cc',
5320 'browser/sync/engine/net/gaia_authenticator.h',
5321 'browser/sync/engine/net/http_return.h',
5322 'browser/sync/engine/net/server_connection_manager.cc',
5323 'browser/sync/engine/net/server_connection_manager.h',
5324 'browser/sync/engine/net/syncapi_server_connection_manager.cc',
5325 'browser/sync/engine/net/syncapi_server_connection_manager.h',
5326 'browser/sync/engine/net/url_translator.cc',
5327 'browser/sync/engine/net/url_translator.h',
5328 'browser/sync/engine/post_commit_message_command.cc',
5329 'browser/sync/engine/post_commit_message_command.h',
5330 'browser/sync/engine/process_commit_response_command.cc',
5331 'browser/sync/engine/process_commit_response_command.h',
5332 'browser/sync/engine/process_updates_command.cc',
5333 'browser/sync/engine/process_updates_command.h',
5334 'browser/sync/engine/resolve_conflicts_command.cc',
5335 'browser/sync/engine/resolve_conflicts_command.h',
5336 'browser/sync/engine/sync_cycle_state.h',
5337 'browser/sync/engine/sync_process_state.cc',
5338 'browser/sync/engine/sync_process_state.h',
5339 'browser/sync/engine/syncapi.h',
5340 'browser/sync/engine/syncer.cc',
5341 'browser/sync/engine/syncer.h',
5342 'browser/sync/engine/syncer_command.cc',
5343 'browser/sync/engine/syncer_command.h',
5344 'browser/sync/engine/syncer_end_command.cc',
5345 'browser/sync/engine/syncer_end_command.h',
5346 'browser/sync/engine/syncer_proto_util.cc',
5347 'browser/sync/engine/syncer_proto_util.h',
5348 'browser/sync/engine/syncer_session.h',
5349 'browser/sync/engine/syncer_status.cc',
5350 'browser/sync/engine/syncer_status.h',
5351 'browser/sync/engine/syncer_thread.cc',
5352 'browser/sync/engine/syncer_thread.h',
5353 'browser/sync/engine/syncer_thread_timed_stop.cc',
5354 'browser/sync/engine/syncer_thread_timed_stop.h',
5355 'browser/sync/engine/syncer_types.h',
5356 'browser/sync/engine/syncer_util.cc',
5357 'browser/sync/engine/syncer_util.h',
5358 'browser/sync/engine/syncproto.h',
5359 'browser/sync/engine/update_applicator.cc',
5360 'browser/sync/engine/update_applicator.h',
5361 'browser/sync/engine/verify_updates_command.cc',
5362 'browser/sync/engine/verify_updates_command.h',
5363 'browser/sync/protocol/service_constants.h',
5364 'browser/sync/syncable/blob.h',
5365 'browser/sync/syncable/dir_open_result.h',
5366 'browser/sync/syncable/directory_backing_store.cc',
5367 'browser/sync/syncable/directory_backing_store.h',
5368 'browser/sync/syncable/directory_event.h',
5369 'browser/sync/syncable/directory_manager.cc',
5370 'browser/sync/syncable/directory_manager.h',
5371 'browser/sync/syncable/path_name_cmp.h',
5372 'browser/sync/syncable/syncable-inl.h',
5373 'browser/sync/syncable/syncable.cc',
5374 'browser/sync/syncable/syncable.h',
5375 'browser/sync/syncable/syncable_changes_version.h',
5376 'browser/sync/syncable/syncable_columns.h',
5377 'browser/sync/syncable/syncable_id.cc',
5378 'browser/sync/syncable/syncable_id.h',
5379 'browser/sync/util/character_set_converters.cc',
5380 'browser/sync/util/character_set_converters.h',
5381 'browser/sync/util/character_set_converters_posix.cc',
5382 'browser/sync/util/character_set_converters_win.cc',
5383 'browser/sync/util/closure.h',
5384 'browser/sync/util/compat_file.h',
5385 'browser/sync/util/compat_file_posix.cc',
5386 'browser/sync/util/compat_file_win.cc',
5387 'browser/sync/util/crypto_helpers.cc',
5388 'browser/sync/util/crypto_helpers.h',
5389 'browser/sync/util/dbgq.h',
5390 'browser/sync/util/event_sys-inl.h',
5391 'browser/sync/util/event_sys.h',
5392 'browser/sync/util/fast_dump.h',
5393 'browser/sync/util/highres_timer.h',
5394 'browser/sync/util/highres_timer_linux.cc',
5395 'browser/sync/util/highres_timer_linux.h',
5396 'browser/sync/util/highres_timer_mac.cc',
5397 'browser/sync/util/highres_timer_mac.h',
5398 'browser/sync/util/highres_timer_win.cc',
5399 'browser/sync/util/highres_timer_win.h',
5400 'browser/sync/util/path_helpers.h',
5401 'browser/sync/util/path_helpers_linux.cc',
5402 'browser/sync/util/path_helpers_mac.cc',
5403 'browser/sync/util/path_helpers_posix.cc',
5404 'browser/sync/util/query_helpers.cc',
5405 'browser/sync/util/query_helpers.h',
5406 'browser/sync/util/row_iterator.h',
5407 'browser/sync/util/signin.h',
5408 'browser/sync/util/sync_types.h',
5409 'browser/sync/util/user_settings.cc',
5410 'browser/sync/util/user_settings.h',
5411 'browser/sync/util/user_settings_posix.cc',
5412 'browser/sync/util/user_settings_win.cc',
5413 ],
5414 'include_dirs': [
5415 '..',
5416 '<(protoc_out_dir)',
5417 ],
5418 'defines' : [
5419 'SYNC_ENGINE_VERSION_STRING="Unknown"',
5420 '_CRT_SECURE_NO_WARNINGS',
5421 '_USE_32BIT_TIME_T',
5422 ],
5423 'dependencies': [
5424 '../third_party/libjingle/libjingle.gyp:libjingle',
5425 'sync_proto',
5426 ],
5427 'conditions': [
5428 ['OS=="win"', {
5429 'sources' : [
5430 'browser/sync/util/data_encryption.cc',
5431 'browser/sync/util/data_encryption.h',
5432 'browser/sync/util/path_helpers.cc',
5433 ],
5434 }],
5435 ['OS=="linux"', {
5436 'defines': [
5437 'POSIX',
5438 ],
5439 'dependencies': [
5440 '../build/linux/system.gyp:gtk'
5441 ],
5442 }],
5443 ['OS=="mac"', {
5444 'link_settings': {
5445 'libraries': [
5446 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
5447 ],
5448 },
5449 }],
5450 ],
5451 },
5087 ], 5452 ],
5088 'conditions': [ 5453 'conditions': [
5089 ['OS=="mac" or OS=="win"', { 5454 ['OS=="mac" or OS=="win"', {
5090 'targets': [ 5455 'targets': [
5091 { 5456 {
5092 'target_name': 'chrome_dll', 5457 'target_name': 'chrome_dll',
5093 'type': 'shared_library', 5458 'type': 'shared_library',
5094 'dependencies': [ 5459 'dependencies': [
5095 '<@(chromium_dependencies)', 5460 '<@(chromium_dependencies)',
5096 ], 5461 ],
(...skipping 1475 matching lines...) Expand 10 before | Expand all | Expand 10 after
6572 '--', 6937 '--',
6573 '<@(_dependencies)'], 6938 '<@(_dependencies)'],
6574 # Use outputs of this action as inputs for the main target build. 6939 # Use outputs of this action as inputs for the main target build.
6575 # Seems as a misnomer but makes this happy on Linux (scons). 6940 # Seems as a misnomer but makes this happy on Linux (scons).
6576 'process_outputs_as_sources': 1, 6941 'process_outputs_as_sources': 1,
6577 }, 6942 },
6578 ], # 'actions' 6943 ], # 'actions'
6579 }, 6944 },
6580 ] 6945 ]
6581 }], 6946 }],
6582 ['browser_sync==1', {
6583 # These targets get built only where sync is supported.
6584 'targets': [
6585 {
6586 # Protobuf compiler / generate rule for sync.proto
6587 'target_name': 'sync_proto',
6588 'type': 'none',
6589 'actions': [
6590 {
6591 'action_name': 'compiling sync.proto',
6592 'inputs': [
6593 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
6594 'browser/sync/protocol/sync.proto',
6595 ],
6596 'outputs': [
6597 '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.cc',
6598 '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.h',
6599 ],
6600 'action': [
6601 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
6602 '--proto_path=browser/sync/protocol',
6603 'browser/sync/protocol/sync.proto',
6604 '--cpp_out=<(protoc_out_dir)/chrome/browser/sync/protocol',
6605 ],
6606 },
6607 ],
6608 'dependencies': [
6609 '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
6610 '../third_party/protobuf2/protobuf.gyp:protoc',
6611 ],
6612 'export_dependent_settings': [
6613 '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
6614 ],
6615 },
6616 {
6617 'target_name': 'notifier',
6618 'type': '<(library)',
6619 'sources': [
6620 'browser/sync/notifier/base/async_dns_lookup.cc',
6621 'browser/sync/notifier/base/async_dns_lookup.h',
6622 'browser/sync/notifier/base/async_network_alive.h',
6623 'browser/sync/notifier/base/fastalloc.h',
6624 'browser/sync/notifier/base/linux/network_status_detector_task_linux .cc',
6625 'browser/sync/notifier/base/linux/time_linux.cc',
6626 'browser/sync/notifier/base/mac/network_status_detector_task_mac.cc' ,
6627 'browser/sync/notifier/base/mac/time_mac.cc',
6628 'browser/sync/notifier/base/nethelpers.cc',
6629 'browser/sync/notifier/base/nethelpers.h',
6630 'browser/sync/notifier/base/network_status_detector_task.cc',
6631 'browser/sync/notifier/base/network_status_detector_task.h',
6632 'browser/sync/notifier/base/network_status_detector_task_mt.cc',
6633 'browser/sync/notifier/base/network_status_detector_task_mt.h',
6634 'browser/sync/notifier/base/posix/time_posix.cc',
6635 'browser/sync/notifier/base/signal_thread_task.h',
6636 'browser/sync/notifier/base/static_assert.h',
6637 'browser/sync/notifier/base/task_pump.cc',
6638 'browser/sync/notifier/base/task_pump.h',
6639 'browser/sync/notifier/base/time.cc',
6640 'browser/sync/notifier/base/time.h',
6641 'browser/sync/notifier/base/timer.cc',
6642 'browser/sync/notifier/base/timer.h',
6643 'browser/sync/notifier/base/utils.h',
6644 'browser/sync/notifier/base/win/async_network_alive_win32.cc',
6645 'browser/sync/notifier/base/win/time_win32.cc',
6646 'browser/sync/notifier/communicator/auth_task.cc',
6647 'browser/sync/notifier/communicator/auth_task.h',
6648 'browser/sync/notifier/communicator/auto_reconnect.cc',
6649 'browser/sync/notifier/communicator/auto_reconnect.h',
6650 'browser/sync/notifier/communicator/connection_options.cc',
6651 'browser/sync/notifier/communicator/connection_options.h',
6652 'browser/sync/notifier/communicator/connection_settings.cc',
6653 'browser/sync/notifier/communicator/connection_settings.h',
6654 'browser/sync/notifier/communicator/const_communicator.h',
6655 'browser/sync/notifier/communicator/login.cc',
6656 'browser/sync/notifier/communicator/login.h',
6657 'browser/sync/notifier/communicator/login_failure.cc',
6658 'browser/sync/notifier/communicator/login_failure.h',
6659 'browser/sync/notifier/communicator/login_settings.cc',
6660 'browser/sync/notifier/communicator/login_settings.h',
6661 'browser/sync/notifier/communicator/product_info.cc',
6662 'browser/sync/notifier/communicator/product_info.h',
6663 'browser/sync/notifier/communicator/single_login_attempt.cc',
6664 'browser/sync/notifier/communicator/single_login_attempt.h',
6665 'browser/sync/notifier/communicator/ssl_socket_adapter.cc',
6666 'browser/sync/notifier/communicator/ssl_socket_adapter.h',
6667 'browser/sync/notifier/communicator/talk_auth_task.cc',
6668 'browser/sync/notifier/communicator/talk_auth_task.h',
6669 'browser/sync/notifier/communicator/xmpp_connection_generator.cc',
6670 'browser/sync/notifier/communicator/xmpp_connection_generator.h',
6671 'browser/sync/notifier/communicator/xmpp_log.cc',
6672 'browser/sync/notifier/communicator/xmpp_log.h',
6673 'browser/sync/notifier/communicator/xmpp_socket_adapter.cc',
6674 'browser/sync/notifier/communicator/xmpp_socket_adapter.h',
6675 'browser/sync/notifier/gaia_auth/gaiaauth.cc',
6676 'browser/sync/notifier/gaia_auth/gaiaauth.h',
6677 'browser/sync/notifier/gaia_auth/gaiahelper.cc',
6678 'browser/sync/notifier/gaia_auth/gaiahelper.h',
6679 'browser/sync/notifier/gaia_auth/inet_aton.h',
6680 'browser/sync/notifier/gaia_auth/sigslotrepeater.h',
6681 'browser/sync/notifier/gaia_auth/win/win32window.cc',
6682 'browser/sync/notifier/listener/listen_task.cc',
6683 'browser/sync/notifier/listener/listen_task.h',
6684 'browser/sync/notifier/listener/mediator_thread.h',
6685 'browser/sync/notifier/listener/mediator_thread_impl.cc',
6686 'browser/sync/notifier/listener/mediator_thread_impl.h',
6687 'browser/sync/notifier/listener/mediator_thread_mock.h',
6688 'browser/sync/notifier/listener/send_update_task.cc',
6689 'browser/sync/notifier/listener/send_update_task.h',
6690 'browser/sync/notifier/listener/subscribe_task.cc',
6691 'browser/sync/notifier/listener/subscribe_task.h',
6692 'browser/sync/notifier/listener/talk_mediator.h',
6693 'browser/sync/notifier/listener/talk_mediator_impl.cc',
6694 'browser/sync/notifier/listener/talk_mediator_impl.h',
6695 ],
6696 'include_dirs': [
6697 '..',
6698 '<(protoc_out_dir)',
6699 ],
6700 'defines' : [
6701 '_CRT_SECURE_NO_WARNINGS',
6702 '_USE_32BIT_TIME_T',
6703 'kXmppProductName="chromium-sync"',
6704 ],
6705 'dependencies': [
6706 '../third_party/expat/expat.gyp:expat',
6707 '../third_party/libjingle/libjingle.gyp:libjingle',
6708 'sync_proto',
6709 ],
6710 'conditions': [
6711 ['OS=="linux"', {
6712 'defines': [
6713 'POSIX',
6714 'OS_LINUX',
6715 ],
6716 'dependencies': [
6717 '../build/linux/system.gyp:gtk'
6718 ],
6719 }],
6720 ],
6721 },
6722 {
6723 'target_name': 'sync_unit_tests',
6724 'type': 'executable',
6725 'sources': [
6726 'browser/sync/engine/all_status_unittest.cc',
6727 'browser/sync/engine/apply_updates_command_unittest.cc',
6728 'browser/sync/engine/auth_watcher_unittest.cc',
6729 'browser/sync/engine/net/gaia_authenticator_unittest.cc',
6730 'browser/sync/engine/syncer_proto_util_unittest.cc',
6731 'browser/sync/engine/syncer_thread_unittest.cc',
6732 'browser/sync/engine/syncer_unittest.cc',
6733 'browser/sync/engine/syncproto_unittest.cc',
6734 'browser/sync/notifier/listener/talk_mediator_unittest.cc',
6735 'browser/sync/syncable/syncable_id_unittest.cc',
6736 'browser/sync/syncable/syncable_unittest.cc',
6737 'browser/sync/util/character_set_converters_unittest.cc',
6738 'browser/sync/util/crypto_helpers_unittest.cc',
6739 'browser/sync/util/event_sys_unittest.cc',
6740 'browser/sync/util/highres_timer_unittest.cc',
6741 'browser/sync/util/path_helpers_unittest.cc',
6742 'browser/sync/util/query_helpers_unittest.cc',
6743 'browser/sync/util/user_settings_unittest.cc',
6744 'test/sync/engine/mock_gaia_authenticator.cc',
6745 'test/sync/engine/mock_gaia_authenticator.h',
6746 'test/sync/engine/mock_gaia_authenticator_unittest.cc',
6747 'test/sync/engine/mock_server_connection.cc',
6748 'test/sync/engine/mock_server_connection.h',
6749 'test/sync/engine/test_directory_setter_upper.cc',
6750 'test/sync/engine/test_directory_setter_upper.h',
6751 'test/sync/engine/test_id_factory.h',
6752 ],
6753 'include_dirs': [
6754 '..',
6755 '<(protoc_out_dir)',
6756 ],
6757 'defines' : [
6758 'SYNC_ENGINE_VERSION_STRING="Unknown"',
6759 '_CRT_SECURE_NO_WARNINGS',
6760 '_USE_32BIT_TIME_T',
6761 ],
6762 'dependencies': [
6763 '../testing/gtest.gyp:gtest',
6764 '../third_party/libjingle/libjingle.gyp:libjingle',
6765 'notifier',
6766 'sync',
6767 'sync_proto',
6768 'test_support_unit',
6769 ],
6770 'conditions': [
6771 ['OS=="win"', {
6772 'sources' : [
6773 'browser/sync/util/data_encryption_unittest.cc',
6774 ],
6775 'dependencies': [
6776 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
6777 ],
6778 'link_settings': {
6779 'libraries': [
6780 '-lcrypt32.lib',
6781 '-lws2_32.lib',
6782 '-lsecur32.lib',
6783 ],
6784 },
6785 }, { # else: OS != "win"
6786 'sources!': [
6787 'browser/sync/util/data_encryption_unittest.cc',
6788 ],
6789 }],
6790 ['OS=="linux"', {
6791 'defines': [
6792 'POSIX',
6793 ],
6794 'dependencies': [
6795 '../build/linux/system.gyp:gtk'
6796 ],
6797 }],
6798 ],
6799 },
6800 {
6801 'target_name': 'sync',
6802 'type': '<(library)',
6803 'sources': [
6804 '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.cc',
6805 '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.h',
6806 'browser/sync/engine/all_status.cc',
6807 'browser/sync/engine/all_status.h',
6808 'browser/sync/engine/apply_updates_command.cc',
6809 'browser/sync/engine/apply_updates_command.h',
6810 'browser/sync/engine/auth_watcher.cc',
6811 'browser/sync/engine/auth_watcher.h',
6812 'browser/sync/engine/authenticator.cc',
6813 'browser/sync/engine/authenticator.h',
6814 'browser/sync/engine/build_and_process_conflict_sets_command.cc',
6815 'browser/sync/engine/build_and_process_conflict_sets_command.h',
6816 'browser/sync/engine/build_commit_command.cc',
6817 'browser/sync/engine/build_commit_command.h',
6818 'browser/sync/engine/change_reorder_buffer.cc',
6819 'browser/sync/engine/change_reorder_buffer.h',
6820 'browser/sync/engine/client_command_channel.h',
6821 'browser/sync/engine/conflict_resolution_view.cc',
6822 'browser/sync/engine/conflict_resolution_view.h',
6823 'browser/sync/engine/conflict_resolver.cc',
6824 'browser/sync/engine/conflict_resolver.h',
6825 'browser/sync/engine/download_updates_command.cc',
6826 'browser/sync/engine/download_updates_command.h',
6827 'browser/sync/engine/get_commit_ids_command.cc',
6828 'browser/sync/engine/get_commit_ids_command.h',
6829 'browser/sync/engine/model_changing_syncer_command.cc',
6830 'browser/sync/engine/model_changing_syncer_command.h',
6831 'browser/sync/engine/model_safe_worker.h',
6832 'browser/sync/engine/net/gaia_authenticator.cc',
6833 'browser/sync/engine/net/gaia_authenticator.h',
6834 'browser/sync/engine/net/http_return.h',
6835 'browser/sync/engine/net/server_connection_manager.cc',
6836 'browser/sync/engine/net/server_connection_manager.h',
6837 'browser/sync/engine/net/syncapi_server_connection_manager.cc',
6838 'browser/sync/engine/net/syncapi_server_connection_manager.h',
6839 'browser/sync/engine/net/url_translator.cc',
6840 'browser/sync/engine/net/url_translator.h',
6841 'browser/sync/engine/post_commit_message_command.cc',
6842 'browser/sync/engine/post_commit_message_command.h',
6843 'browser/sync/engine/process_commit_response_command.cc',
6844 'browser/sync/engine/process_commit_response_command.h',
6845 'browser/sync/engine/process_updates_command.cc',
6846 'browser/sync/engine/process_updates_command.h',
6847 'browser/sync/engine/resolve_conflicts_command.cc',
6848 'browser/sync/engine/resolve_conflicts_command.h',
6849 'browser/sync/engine/sync_cycle_state.h',
6850 'browser/sync/engine/sync_process_state.cc',
6851 'browser/sync/engine/sync_process_state.h',
6852 'browser/sync/engine/syncapi.h',
6853 'browser/sync/engine/syncer.cc',
6854 'browser/sync/engine/syncer.h',
6855 'browser/sync/engine/syncer_command.cc',
6856 'browser/sync/engine/syncer_command.h',
6857 'browser/sync/engine/syncer_end_command.cc',
6858 'browser/sync/engine/syncer_end_command.h',
6859 'browser/sync/engine/syncer_proto_util.cc',
6860 'browser/sync/engine/syncer_proto_util.h',
6861 'browser/sync/engine/syncer_session.h',
6862 'browser/sync/engine/syncer_status.cc',
6863 'browser/sync/engine/syncer_status.h',
6864 'browser/sync/engine/syncer_thread.cc',
6865 'browser/sync/engine/syncer_thread.h',
6866 'browser/sync/engine/syncer_thread_timed_stop.cc',
6867 'browser/sync/engine/syncer_thread_timed_stop.h',
6868 'browser/sync/engine/syncer_types.h',
6869 'browser/sync/engine/syncer_util.cc',
6870 'browser/sync/engine/syncer_util.h',
6871 'browser/sync/engine/syncproto.h',
6872 'browser/sync/engine/update_applicator.cc',
6873 'browser/sync/engine/update_applicator.h',
6874 'browser/sync/engine/verify_updates_command.cc',
6875 'browser/sync/engine/verify_updates_command.h',
6876 'browser/sync/protocol/service_constants.h',
6877 'browser/sync/syncable/blob.h',
6878 'browser/sync/syncable/dir_open_result.h',
6879 'browser/sync/syncable/directory_backing_store.cc',
6880 'browser/sync/syncable/directory_backing_store.h',
6881 'browser/sync/syncable/directory_event.h',
6882 'browser/sync/syncable/directory_manager.cc',
6883 'browser/sync/syncable/directory_manager.h',
6884 'browser/sync/syncable/path_name_cmp.h',
6885 'browser/sync/syncable/syncable-inl.h',
6886 'browser/sync/syncable/syncable.cc',
6887 'browser/sync/syncable/syncable.h',
6888 'browser/sync/syncable/syncable_changes_version.h',
6889 'browser/sync/syncable/syncable_columns.h',
6890 'browser/sync/syncable/syncable_id.cc',
6891 'browser/sync/syncable/syncable_id.h',
6892 'browser/sync/util/character_set_converters.cc',
6893 'browser/sync/util/character_set_converters.h',
6894 'browser/sync/util/character_set_converters_posix.cc',
6895 'browser/sync/util/character_set_converters_win.cc',
6896 'browser/sync/util/closure.h',
6897 'browser/sync/util/compat_file.h',
6898 'browser/sync/util/compat_file_posix.cc',
6899 'browser/sync/util/compat_file_win.cc',
6900 'browser/sync/util/crypto_helpers.cc',
6901 'browser/sync/util/crypto_helpers.h',
6902 'browser/sync/util/dbgq.h',
6903 'browser/sync/util/event_sys-inl.h',
6904 'browser/sync/util/event_sys.h',
6905 'browser/sync/util/fast_dump.h',
6906 'browser/sync/util/highres_timer.h',
6907 'browser/sync/util/highres_timer_linux.cc',
6908 'browser/sync/util/highres_timer_linux.h',
6909 'browser/sync/util/highres_timer_mac.cc',
6910 'browser/sync/util/highres_timer_mac.h',
6911 'browser/sync/util/highres_timer_win.cc',
6912 'browser/sync/util/highres_timer_win.h',
6913 'browser/sync/util/path_helpers.h',
6914 'browser/sync/util/path_helpers_linux.cc',
6915 'browser/sync/util/path_helpers_mac.cc',
6916 'browser/sync/util/path_helpers_posix.cc',
6917 'browser/sync/util/query_helpers.cc',
6918 'browser/sync/util/query_helpers.h',
6919 'browser/sync/util/row_iterator.h',
6920 'browser/sync/util/signin.h',
6921 'browser/sync/util/sync_types.h',
6922 'browser/sync/util/user_settings.cc',
6923 'browser/sync/util/user_settings.h',
6924 'browser/sync/util/user_settings_posix.cc',
6925 'browser/sync/util/user_settings_win.cc',
6926 ],
6927 'include_dirs': [
6928 '..',
6929 '<(protoc_out_dir)',
6930 ],
6931 'defines' : [
6932 'SYNC_ENGINE_VERSION_STRING="Unknown"',
6933 '_CRT_SECURE_NO_WARNINGS',
6934 '_USE_32BIT_TIME_T',
6935 ],
6936 'dependencies': [
6937 '../third_party/libjingle/libjingle.gyp:libjingle',
6938 'sync_proto',
6939 ],
6940 'conditions': [
6941 ['OS=="win"', {
6942 'sources' : [
6943 'browser/sync/util/data_encryption.cc',
6944 'browser/sync/util/data_encryption.h',
6945 'browser/sync/util/path_helpers.cc',
6946 ],
6947 }],
6948 ['OS=="linux"', {
6949 'defines': [
6950 'POSIX',
6951 ],
6952 'dependencies': [
6953 '../build/linux/system.gyp:gtk'
6954 ],
6955 }],
6956 ['OS=="mac"', {
6957 'link_settings': {
6958 'libraries': [
6959 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
6960 ],
6961 },
6962 }],
6963 ],
6964 },
6965 ], # targets when browser_sync==1
6966 }],
6967 ], # 'conditions' 6947 ], # 'conditions'
6968 } 6948 }
6969 6949
6970 # Local Variables: 6950 # Local Variables:
6971 # tab-width:2 6951 # tab-width:2
6972 # indent-tabs-mode:nil 6952 # indent-tabs-mode:nil
6973 # End: 6953 # End:
6974 # vim: set expandtab tabstop=2 shiftwidth=2: 6954 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/views/toolbar_view.cc ('k') | chrome/test/live_sync/bookmark_model_verifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698