Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 ######################################################################## | |
| 6 # If your target depends on the sync library, all you need to include | |
| 7 # is: | |
| 8 # | |
| 9 # 'dependencies': [ | |
| 10 # '../sync/sync.gyp:sync', | |
| 11 # ], | |
| 12 # 'export_dependent_settings': [ | |
| 13 # '../sync/sync.gyp:sync', | |
| 14 # ], | |
|
Ryan Sleevi
2012/07/20 23:24:49
Can you explain why it's necessary to export the s
| |
| 15 # | |
| 16 # (If your target is an executable, you can omit the | |
| 17 # 'export_dependent_settings' block.) | |
| 18 # | |
| 19 ######################################################################## | |
| 20 | |
| 5 { | 21 { |
| 6 'variables': { | 22 'variables': { |
| 7 'chromium_code': 1, | 23 'chromium_code': 1, |
| 8 }, | 24 }, |
| 9 'targets': [ | 25 'targets': [ |
| 26 | |
| 27 #################################################################### | |
| 28 # 'sync' and its dependencies | |
| 29 #################################################################### | |
| 30 | |
| 10 # The core sync library. | 31 # The core sync library. |
| 11 # | |
| 12 # TODO(akalin): Rename this to something like 'sync_core' and | |
| 13 # reserve the 'sync' name for the overarching library that clients | |
| 14 # should depend on. | |
| 15 { | 32 { |
| 16 'target_name': 'sync', | 33 'target_name': 'sync_core', |
| 17 # TODO(akalin): Change this to '<(component)'. When we rename | |
| 18 # this to 'sync_core' and make the overarching 'sync' library, | |
| 19 # make that one '<(component)'. | |
| 20 'type': 'static_library', | 34 'type': 'static_library', |
| 21 'variables': { 'enable_wexit_time_destructors': 1, }, | 35 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 22 'include_dirs': [ | 36 'include_dirs': [ |
| 23 '..', | 37 '..', |
| 24 ], | 38 ], |
| 25 'defines': [ | 39 'defines': [ |
| 26 'SYNC_IMPLEMENTATION', | 40 'SYNC_IMPLEMENTATION', |
| 27 ], | 41 ], |
| 28 'dependencies': [ | 42 'dependencies': [ |
| 29 '../base/base.gyp:base', | 43 '../base/base.gyp:base', |
| 30 '../build/temp_gyp/googleurl.gyp:googleurl', | 44 '../build/temp_gyp/googleurl.gyp:googleurl', |
| 31 '../crypto/crypto.gyp:crypto', | 45 '../crypto/crypto.gyp:crypto', |
| 32 '../net/net.gyp:net', | 46 '../net/net.gyp:net', |
| 33 '../sql/sql.gyp:sql', | 47 '../sql/sql.gyp:sql', |
| 34 'protocol/sync_proto.gyp:sync_proto', | 48 'protocol/sync_proto.gyp:sync_proto', |
| 35 ], | 49 ], |
| 36 'export_dependent_settings': [ | 50 'export_dependent_settings': [ |
| 37 # Propagate sync_proto since our headers include its generated | 51 # Propagate sync_proto since our headers include its generated |
| 38 # files. | 52 # files. |
| 39 'protocol/sync_proto.gyp:sync_proto', | 53 'protocol/sync_proto.gyp:sync_proto', |
| 40 ], | 54 ], |
| 41 'sources': [ | 55 'sources': [ |
| 42 'base/sync_export.h', | 56 'base/sync_export.h', |
| 43 'internal_api/public/base/enum_set.h', | |
| 44 'internal_api/public/base/model_type.h', | |
| 45 'internal_api/public/base/model_type_payload_map.cc', | |
| 46 'internal_api/public/base/model_type_payload_map.h', | |
| 47 'internal_api/public/engine/model_safe_worker.cc', | |
| 48 'internal_api/public/engine/model_safe_worker.h', | |
| 49 'internal_api/public/engine/passive_model_worker.cc', | |
| 50 'internal_api/public/engine/passive_model_worker.h', | |
| 51 'internal_api/public/engine/polling_constants.cc', | |
| 52 'internal_api/public/engine/polling_constants.h', | |
| 53 'internal_api/public/engine/sync_status.cc', | |
| 54 'internal_api/public/engine/sync_status.h', | |
| 55 'internal_api/public/sessions/model_neutral_state.cc', | |
| 56 'internal_api/public/sessions/model_neutral_state.h', | |
| 57 'internal_api/public/sessions/sync_session_snapshot.cc', | |
| 58 'internal_api/public/sessions/sync_session_snapshot.h', | |
| 59 'internal_api/public/sessions/sync_source_info.cc', | |
| 60 'internal_api/public/sessions/sync_source_info.h', | |
| 61 'internal_api/public/util/experiments.h', | |
| 62 'internal_api/public/util/immutable.h', | |
| 63 'internal_api/public/util/syncer_error.cc', | |
| 64 'internal_api/public/util/syncer_error.h', | |
| 65 'internal_api/public/util/sync_string_conversions.cc', | |
| 66 'internal_api/public/util/sync_string_conversions.h', | |
| 67 'internal_api/public/util/report_unrecoverable_error_function.h', | |
| 68 'internal_api/public/util/unrecoverable_error_handler.h', | |
| 69 'internal_api/public/util/unrecoverable_error_info.h', | |
| 70 'internal_api/public/util/unrecoverable_error_info.cc', | |
| 71 'internal_api/public/util/weak_handle.cc', | |
| 72 'internal_api/public/util/weak_handle.h', | |
| 73 'engine/all_status.cc', | 57 'engine/all_status.cc', |
| 74 'engine/all_status.h', | 58 'engine/all_status.h', |
| 75 'engine/apply_updates_command.cc', | 59 'engine/apply_updates_command.cc', |
| 76 'engine/apply_updates_command.h', | 60 'engine/apply_updates_command.h', |
| 77 'engine/build_commit_command.cc', | 61 'engine/build_commit_command.cc', |
| 78 'engine/build_commit_command.h', | 62 'engine/build_commit_command.h', |
| 79 'engine/cleanup_disabled_types_command.cc', | 63 'engine/cleanup_disabled_types_command.cc', |
| 80 'engine/cleanup_disabled_types_command.h', | 64 'engine/cleanup_disabled_types_command.h', |
| 81 'engine/commit.cc', | 65 'engine/commit.cc', |
| 82 'engine/commit.h', | 66 'engine/commit.h', |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 233 'include_dirs': [ | 217 'include_dirs': [ |
| 234 '..', | 218 '..', |
| 235 ], | 219 ], |
| 236 'dependencies': [ | 220 'dependencies': [ |
| 237 '../base/base.gyp:base', | 221 '../base/base.gyp:base', |
| 238 '../jingle/jingle.gyp:notifier', | 222 '../jingle/jingle.gyp:notifier', |
| 239 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', | 223 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', |
| 240 # TODO(akalin): Remove this (http://crbug.com/133352). | 224 # TODO(akalin): Remove this (http://crbug.com/133352). |
| 241 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n_proto_cpp', | 225 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n_proto_cpp', |
| 242 '../third_party/libjingle/libjingle.gyp:libjingle', | 226 '../third_party/libjingle/libjingle.gyp:libjingle', |
| 243 'sync', | 227 'sync_core', |
| 244 ], | 228 ], |
| 245 'export_dependent_settings': [ | 229 'export_dependent_settings': [ |
| 246 '../jingle/jingle.gyp:notifier', | 230 '../jingle/jingle.gyp:notifier', |
| 247 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', | 231 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', |
| 248 ], | 232 ], |
| 249 'sources': [ | 233 'sources': [ |
| 250 'notifier/invalidation_util.cc', | 234 'notifier/invalidation_util.cc', |
| 251 'notifier/invalidation_util.h', | 235 'notifier/invalidation_util.h', |
| 252 'notifier/notifications_disabled_reason.h', | 236 'notifier/notifications_disabled_reason.h', |
| 253 'notifier/notifications_disabled_reason.cc', | 237 'notifier/notifications_disabled_reason.cc', |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 275 'notifier/registration_manager.cc', | 259 'notifier/registration_manager.cc', |
| 276 'notifier/registration_manager.h', | 260 'notifier/registration_manager.h', |
| 277 'notifier/state_writer.h', | 261 'notifier/state_writer.h', |
| 278 ], | 262 ], |
| 279 }], | 263 }], |
| 280 ], | 264 ], |
| 281 }, | 265 }, |
| 282 | 266 |
| 283 # The sync internal API library. | 267 # The sync internal API library. |
| 284 { | 268 { |
| 285 'target_name': 'syncapi_core', | 269 'target_name': 'sync_internal_api', |
| 286 'type': 'static_library', | 270 'type': 'static_library', |
| 287 'variables': { 'enable_wexit_time_destructors': 1, }, | 271 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 288 'include_dirs': [ | 272 'include_dirs': [ |
| 289 '..', | 273 '..', |
| 290 ], | 274 ], |
| 291 'dependencies': [ | 275 'dependencies': [ |
| 292 '../base/base.gyp:base', | 276 '../base/base.gyp:base', |
| 293 '../build/temp_gyp/googleurl.gyp:googleurl', | 277 '../build/temp_gyp/googleurl.gyp:googleurl', |
| 294 '../net/net.gyp:net', | 278 '../net/net.gyp:net', |
| 295 'protocol/sync_proto.gyp:sync_proto', | 279 'protocol/sync_proto.gyp:sync_proto', |
| 296 'sync_notifier', | 280 'sync_notifier', |
| 297 'sync', | 281 'sync_core', |
| 298 ], | 282 ], |
| 299 'export_dependent_settings': [ | 283 'export_dependent_settings': [ |
| 300 # Propagate sync_proto since our headers include its generated | 284 # Propagate sync_proto since our headers include its generated |
| 301 # files. | 285 # files. |
| 302 'protocol/sync_proto.gyp:sync_proto', | 286 'protocol/sync_proto.gyp:sync_proto', |
|
Ryan Sleevi
2012/07/20 23:24:49
Are you directly using/building these protobufs in
| |
| 303 'sync', | 287 'sync_core', |
| 304 ], | 288 ], |
| 305 'sources': [ | 289 'sources': [ |
| 290 'internal_api/public/base/enum_set.h', | |
| 291 'internal_api/public/base/model_type.h', | |
| 292 'internal_api/public/base/model_type_payload_map.cc', | |
| 293 'internal_api/public/base/model_type_payload_map.h', | |
| 306 'internal_api/public/base_node.h', | 294 'internal_api/public/base_node.h', |
| 307 'internal_api/public/base_transaction.h', | 295 'internal_api/public/base_transaction.h', |
| 308 'internal_api/public/change_record.h', | 296 'internal_api/public/change_record.h', |
| 309 'internal_api/public/configure_reason.h', | 297 'internal_api/public/configure_reason.h', |
| 298 'internal_api/public/engine/model_safe_worker.cc', | |
| 299 'internal_api/public/engine/model_safe_worker.h', | |
| 300 'internal_api/public/engine/passive_model_worker.cc', | |
| 301 'internal_api/public/engine/passive_model_worker.h', | |
| 302 'internal_api/public/engine/polling_constants.cc', | |
| 303 'internal_api/public/engine/polling_constants.h', | |
| 304 'internal_api/public/engine/sync_status.cc', | |
| 305 'internal_api/public/engine/sync_status.h', | |
| 310 'internal_api/public/http_bridge.h', | 306 'internal_api/public/http_bridge.h', |
| 311 'internal_api/public/http_post_provider_factory.h', | 307 'internal_api/public/http_post_provider_factory.h', |
| 312 'internal_api/public/http_post_provider_interface.h', | 308 'internal_api/public/http_post_provider_interface.h', |
| 313 'internal_api/public/internal_components_factory.h', | 309 'internal_api/public/internal_components_factory.h', |
| 314 'internal_api/public/internal_components_factory_impl.h', | 310 'internal_api/public/internal_components_factory_impl.h', |
| 315 'internal_api/public/read_node.h', | 311 'internal_api/public/read_node.h', |
| 316 'internal_api/public/read_transaction.h', | 312 'internal_api/public/read_transaction.h', |
| 313 'internal_api/public/sessions/model_neutral_state.cc', | |
| 314 'internal_api/public/sessions/model_neutral_state.h', | |
| 315 'internal_api/public/sessions/sync_session_snapshot.cc', | |
| 316 'internal_api/public/sessions/sync_session_snapshot.h', | |
| 317 'internal_api/public/sessions/sync_source_info.cc', | |
| 318 'internal_api/public/sessions/sync_source_info.h', | |
| 317 'internal_api/public/sync_manager.h', | 319 'internal_api/public/sync_manager.h', |
| 318 'internal_api/public/sync_manager.cc', | 320 'internal_api/public/sync_manager.cc', |
| 319 'internal_api/public/sync_manager_factory.h', | 321 'internal_api/public/sync_manager_factory.h', |
| 320 'internal_api/public/user_share.h', | 322 'internal_api/public/user_share.h', |
| 323 'internal_api/public/util/experiments.h', | |
| 324 'internal_api/public/util/immutable.h', | |
| 325 'internal_api/public/util/syncer_error.cc', | |
| 326 'internal_api/public/util/syncer_error.h', | |
| 327 'internal_api/public/util/sync_string_conversions.cc', | |
| 328 'internal_api/public/util/sync_string_conversions.h', | |
| 329 'internal_api/public/util/report_unrecoverable_error_function.h', | |
| 330 'internal_api/public/util/unrecoverable_error_handler.h', | |
| 331 'internal_api/public/util/unrecoverable_error_info.h', | |
| 332 'internal_api/public/util/unrecoverable_error_info.cc', | |
| 333 'internal_api/public/util/weak_handle.cc', | |
| 334 'internal_api/public/util/weak_handle.h', | |
| 321 'internal_api/public/write_node.h', | 335 'internal_api/public/write_node.h', |
| 322 'internal_api/public/write_transaction.h', | 336 'internal_api/public/write_transaction.h', |
| 323 'internal_api/base_node.cc', | 337 'internal_api/base_node.cc', |
| 324 'internal_api/base_transaction.cc', | 338 'internal_api/base_transaction.cc', |
| 325 'internal_api/change_record.cc', | 339 'internal_api/change_record.cc', |
| 326 'internal_api/change_reorder_buffer.cc', | 340 'internal_api/change_reorder_buffer.cc', |
| 327 'internal_api/change_reorder_buffer.h', | 341 'internal_api/change_reorder_buffer.h', |
| 328 'internal_api/debug_info_event_listener.cc', | 342 'internal_api/debug_info_event_listener.cc', |
| 329 'internal_api/debug_info_event_listener.h', | 343 'internal_api/debug_info_event_listener.h', |
| 330 'internal_api/http_bridge.cc', | 344 'internal_api/http_bridge.cc', |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 343 'internal_api/sync_manager_impl.cc', | 357 'internal_api/sync_manager_impl.cc', |
| 344 'internal_api/sync_manager_impl.h', | 358 'internal_api/sync_manager_impl.h', |
| 345 'internal_api/user_share.cc', | 359 'internal_api/user_share.cc', |
| 346 'internal_api/write_node.cc', | 360 'internal_api/write_node.cc', |
| 347 'internal_api/write_transaction.cc', | 361 'internal_api/write_transaction.cc', |
| 348 ], | 362 ], |
| 349 }, | 363 }, |
| 350 | 364 |
| 351 # The sync external API library. | 365 # The sync external API library. |
| 352 { | 366 { |
| 353 'target_name': 'syncapi_service', | 367 'target_name': 'sync_api', |
| 354 'type': 'static_library', | 368 'type': 'static_library', |
| 355 'variables': { 'enable_wexit_time_destructors': 1, }, | 369 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 356 'include_dirs': [ | 370 'include_dirs': [ |
| 357 '..', | 371 '..', |
| 358 ], | 372 ], |
| 359 'dependencies': [ | 373 'dependencies': [ |
| 360 '../base/base.gyp:base', | 374 '../base/base.gyp:base', |
| 361 'protocol/sync_proto.gyp:sync_proto', | 375 'protocol/sync_proto.gyp:sync_proto', |
| 362 'sync', | 376 'sync_core', |
| 363 ], | 377 ], |
| 364 # We avoid including header files from sync_proto in our public | 378 # We avoid including header files from sync_proto in our public |
| 365 # header files so we don't need to export its settings. | 379 # header files so we don't need to export its settings. |
| 366 'sources': [ | 380 'sources': [ |
| 367 'api/syncable_service.cc', | 381 'api/syncable_service.cc', |
| 368 'api/syncable_service.h', | 382 'api/syncable_service.h', |
| 369 'api/sync_data.h', | 383 'api/sync_data.h', |
| 370 'api/sync_data.cc', | 384 'api/sync_data.cc', |
| 371 'api/sync_change.h', | 385 'api/sync_change.h', |
| 372 'api/sync_change.cc', | 386 'api/sync_change.cc', |
| 373 'api/sync_change_processor.h', | 387 'api/sync_change_processor.h', |
| 374 'api/sync_change_processor.cc', | 388 'api/sync_change_processor.cc', |
| 375 'api/sync_error.h', | 389 'api/sync_error.h', |
| 376 'api/sync_error.cc', | 390 'api/sync_error.cc', |
| 377 'api/sync_error_factory.h', | 391 'api/sync_error_factory.h', |
| 378 'api/sync_error_factory.cc', | 392 'api/sync_error_factory.cc', |
| 379 ], | 393 ], |
| 380 }, | 394 }, |
| 381 | 395 |
| 382 # Test support files for the 'sync' target. | 396 # The componentized sync library. |
| 383 { | 397 { |
| 384 'target_name': 'test_support_sync', | 398 'target_name': 'sync_component', |
| 399 # TODO(akalin): Change this to '<(component)'. | |
| 400 'type': 'static_library', | |
| 401 'variables': { 'enable_wexit_time_destructors': 1, }, | |
| 402 'dependencies': [ | |
| 403 'sync_core', | |
| 404 'sync_notifier', | |
| 405 'sync_internal_api', | |
| 406 'sync_api', | |
| 407 ], | |
| 408 'export_dependent_settings': [ | |
| 409 'sync_core', | |
| 410 'sync_notifier', | |
| 411 'sync_internal_api', | |
| 412 'sync_api', | |
| 413 ], | |
| 414 }, | |
| 415 | |
| 416 # The public sync target. This depends on 'sync_component' and | |
| 417 # 'sync_proto' separately since 'sync_proto' isn't exportable from | |
| 418 # 'sync_component' (for now). | |
| 419 { | |
| 420 'target_name': 'sync', | |
| 421 'type': 'none', | |
| 422 'dependencies': [ | |
| 423 'sync_component', | |
| 424 'protocol/sync_proto.gyp:sync_proto', | |
| 425 ], | |
| 426 'export_dependent_settings': [ | |
| 427 'sync_component', | |
| 428 'protocol/sync_proto.gyp:sync_proto', | |
| 429 ], | |
| 430 }, | |
| 431 | |
| 432 #################################################################### | |
| 433 # Test support targets | |
| 434 #################################################################### | |
| 435 | |
| 436 # Test support files for the 'sync_core' target. | |
| 437 { | |
| 438 'target_name': 'test_support_sync_core', | |
| 385 'type': 'static_library', | 439 'type': 'static_library', |
| 386 'variables': { 'enable_wexit_time_destructors': 1, }, | 440 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 387 'include_dirs': [ | 441 'include_dirs': [ |
| 388 '..', | 442 '..', |
| 389 ], | 443 ], |
| 390 'dependencies': [ | 444 'dependencies': [ |
| 391 '../base/base.gyp:base', | 445 '../base/base.gyp:base', |
| 392 '../testing/gmock.gyp:gmock', | 446 '../testing/gmock.gyp:gmock', |
| 393 '../testing/gtest.gyp:gtest', | 447 '../testing/gtest.gyp:gtest', |
| 394 'protocol/sync_proto.gyp:sync_proto', | |
| 395 'sync', | 448 'sync', |
| 396 ], | 449 ], |
| 397 'export_dependent_settings': [ | 450 'export_dependent_settings': [ |
| 398 '../testing/gmock.gyp:gmock', | 451 '../testing/gmock.gyp:gmock', |
| 399 '../testing/gtest.gyp:gtest', | 452 '../testing/gtest.gyp:gtest', |
| 400 'protocol/sync_proto.gyp:sync_proto', | |
| 401 'sync', | 453 'sync', |
| 402 ], | 454 ], |
| 403 'sources': [ | 455 'sources': [ |
| 404 'internal_api/public/base/model_type_test_util.cc', | 456 'internal_api/public/base/model_type_test_util.cc', |
| 405 'internal_api/public/base/model_type_test_util.h', | 457 'internal_api/public/base/model_type_test_util.h', |
| 406 'js/js_test_util.cc', | 458 'js/js_test_util.cc', |
| 407 'js/js_test_util.h', | 459 'js/js_test_util.h', |
| 408 'sessions/test_util.cc', | 460 'sessions/test_util.cc', |
| 409 'sessions/test_util.h', | 461 'sessions/test_util.h', |
| 410 'syncable/syncable_mock.cc', | 462 'syncable/syncable_mock.cc', |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 442 # Test support files for the 'sync_notifier' target. | 494 # Test support files for the 'sync_notifier' target. |
| 443 { | 495 { |
| 444 'target_name': 'test_support_sync_notifier', | 496 'target_name': 'test_support_sync_notifier', |
| 445 'type': 'static_library', | 497 'type': 'static_library', |
| 446 'variables': { 'enable_wexit_time_destructors': 1, }, | 498 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 447 'include_dirs': [ | 499 'include_dirs': [ |
| 448 '..', | 500 '..', |
| 449 ], | 501 ], |
| 450 'dependencies': [ | 502 'dependencies': [ |
| 451 '../testing/gmock.gyp:gmock', | 503 '../testing/gmock.gyp:gmock', |
| 452 'sync_notifier', | 504 'sync', |
| 453 ], | 505 ], |
| 454 'export_dependent_settings': [ | 506 'export_dependent_settings': [ |
| 455 '../testing/gmock.gyp:gmock', | 507 '../testing/gmock.gyp:gmock', |
| 456 'sync_notifier', | 508 'sync', |
| 457 ], | 509 ], |
| 458 'sources': [ | 510 'sources': [ |
| 459 'notifier/mock_invalidation_state_tracker.cc', | 511 'notifier/mock_invalidation_state_tracker.cc', |
| 460 'notifier/mock_invalidation_state_tracker.h', | 512 'notifier/mock_invalidation_state_tracker.h', |
| 461 'notifier/mock_sync_notifier_observer.cc', | 513 'notifier/mock_sync_notifier_observer.cc', |
| 462 'notifier/mock_sync_notifier_observer.h', | 514 'notifier/mock_sync_notifier_observer.h', |
| 463 ], | 515 ], |
| 464 }, | 516 }, |
| 465 | 517 |
| 466 # Test support files for the 'syncapi_core' target. | 518 # Test support files for the 'sync_internal_api' target. |
| 467 { | 519 { |
| 468 'target_name': 'test_support_syncapi_core', | 520 'target_name': 'test_support_sync_internal_api', |
| 469 'type': 'static_library', | 521 'type': 'static_library', |
| 470 'variables': { 'enable_wexit_time_destructors': 1, }, | 522 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 471 'include_dirs': [ | 523 'include_dirs': [ |
| 472 '..', | 524 '..', |
| 473 ], | 525 ], |
| 474 'dependencies': [ | 526 'dependencies': [ |
| 475 '../base/base.gyp:base', | 527 '../base/base.gyp:base', |
| 476 '../testing/gtest.gyp:gtest', | 528 '../testing/gtest.gyp:gtest', |
| 477 'syncapi_core', | 529 'sync', |
| 478 'test_support_sync', | 530 'test_support_sync_core', |
| 479 ], | 531 ], |
| 480 'export_dependent_settings': [ | 532 'export_dependent_settings': [ |
| 481 '../testing/gtest.gyp:gtest', | 533 '../testing/gtest.gyp:gtest', |
| 482 'syncapi_core', | 534 'sync', |
| 483 'test_support_sync', | 535 'test_support_sync_core', |
| 484 ], | 536 ], |
| 485 'sources': [ | 537 'sources': [ |
| 486 'internal_api/public/test/fake_sync_manager.h', | 538 'internal_api/public/test/fake_sync_manager.h', |
| 487 'internal_api/public/test/test_entry_factory.h', | 539 'internal_api/public/test/test_entry_factory.h', |
| 488 'internal_api/public/test/test_internal_components_factory.h', | 540 'internal_api/public/test/test_internal_components_factory.h', |
| 489 'internal_api/public/test/test_user_share.h', | 541 'internal_api/public/test/test_user_share.h', |
| 490 'internal_api/test/fake_sync_manager.cc', | 542 'internal_api/test/fake_sync_manager.cc', |
| 491 'internal_api/test/test_entry_factory.cc', | 543 'internal_api/test/test_entry_factory.cc', |
| 492 'internal_api/test/test_internal_components_factory.cc', | 544 'internal_api/test/test_internal_components_factory.cc', |
| 493 'internal_api/test/test_user_share.cc', | 545 'internal_api/test/test_user_share.cc', |
| 494 ], | 546 ], |
| 495 }, | 547 }, |
| 496 | 548 |
| 497 # Test support files for the 'syncapi_service' target. | 549 # Test support files for the 'sync_api' target. |
| 498 { | 550 { |
| 499 'target_name': 'test_support_syncapi_service', | 551 'target_name': 'test_support_sync_api', |
| 500 'type': 'static_library', | 552 'type': 'static_library', |
| 501 'include_dirs': [ | 553 'include_dirs': [ |
| 502 '..', | 554 '..', |
| 503 ], | 555 ], |
| 504 'dependencies': [ | 556 'dependencies': [ |
| 505 '../testing/gmock.gyp:gmock', | 557 '../testing/gmock.gyp:gmock', |
| 506 'syncapi_service', | 558 'sync', |
| 507 ], | 559 ], |
| 508 'export_dependent_settings': [ | 560 'export_dependent_settings': [ |
| 509 '../testing/gmock.gyp:gmock', | 561 '../testing/gmock.gyp:gmock', |
| 510 'syncapi_service', | 562 'sync', |
| 511 ], | 563 ], |
| 512 'sources': [ | 564 'sources': [ |
| 513 'api/fake_syncable_service.cc', | 565 'api/fake_syncable_service.cc', |
| 514 'api/fake_syncable_service.h', | 566 'api/fake_syncable_service.h', |
| 515 'api/sync_error_factory_mock.cc', | 567 'api/sync_error_factory_mock.cc', |
| 516 'api/sync_error_factory_mock.h', | 568 'api/sync_error_factory_mock.h', |
| 517 ], | 569 ], |
| 518 }, | 570 }, |
| 519 | 571 |
| 520 # Unit tests for the 'sync' target. This cannot be a static | 572 #################################################################### |
| 573 # 'sync_unit_tests' and its dependencies | |
| 574 #################################################################### | |
| 575 | |
| 576 # Unit tests for the 'sync_core' target. This cannot be a static | |
| 521 # library because the unit test files have to be compiled directly | 577 # library because the unit test files have to be compiled directly |
| 522 # into the executable, so we push the target files to the | 578 # into the executable, so we push the target files to the |
| 523 # depending executable target via direct_dependent_settings. | 579 # depending executable target via direct_dependent_settings. |
| 524 { | 580 { |
| 525 'target_name': 'sync_tests', | 581 'target_name': 'sync_core_tests', |
| 526 'type': 'none', | 582 'type': 'none', |
| 527 # We only want unit test executables to include this target. | 583 # We only want unit test executables to include this target. |
| 528 'suppress_wildcard': 1, | 584 'suppress_wildcard': 1, |
| 529 'dependencies': [ | 585 'dependencies': [ |
| 530 '../base/base.gyp:base', | 586 '../base/base.gyp:base', |
| 531 '../testing/gmock.gyp:gmock', | 587 '../testing/gmock.gyp:gmock', |
| 532 '../testing/gtest.gyp:gtest', | 588 '../testing/gtest.gyp:gtest', |
| 533 'protocol/sync_proto.gyp:sync_proto', | |
| 534 'sync', | 589 'sync', |
| 535 'test_support_sync', | 590 'test_support_sync_core', |
| 536 ], | 591 ], |
| 537 # Propagate all dependencies since the actual compilation | 592 # Propagate all dependencies since the actual compilation |
| 538 # happens in the dependents. | 593 # happens in the dependents. |
| 539 'export_dependent_settings': [ | 594 'export_dependent_settings': [ |
| 540 '../base/base.gyp:base', | 595 '../base/base.gyp:base', |
| 541 '../testing/gmock.gyp:gmock', | 596 '../testing/gmock.gyp:gmock', |
| 542 '../testing/gtest.gyp:gtest', | 597 '../testing/gtest.gyp:gtest', |
| 543 'protocol/sync_proto.gyp:sync_proto', | |
| 544 'sync', | 598 'sync', |
| 545 'test_support_sync', | 599 'test_support_sync_core', |
| 546 ], | 600 ], |
| 547 'direct_dependent_settings': { | 601 'direct_dependent_settings': { |
| 548 'variables': { 'enable_wexit_time_destructors': 1, }, | 602 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 549 'include_dirs': [ | 603 'include_dirs': [ |
| 550 '..', | 604 '..', |
| 551 ], | 605 ], |
| 552 'sources': [ | 606 'sources': [ |
| 553 'internal_api/public/base/enum_set_unittest.cc', | 607 'internal_api/public/base/enum_set_unittest.cc', |
| 554 'internal_api/public/base/model_type_payload_map_unittest.cc', | 608 'internal_api/public/base/model_type_payload_map_unittest.cc', |
| 555 'internal_api/public/engine/model_safe_worker_unittest.cc', | 609 'internal_api/public/engine/model_safe_worker_unittest.cc', |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 606 'suppress_wildcard': 1, | 660 'suppress_wildcard': 1, |
| 607 'dependencies': [ | 661 'dependencies': [ |
| 608 '../base/base.gyp:base', | 662 '../base/base.gyp:base', |
| 609 '../jingle/jingle.gyp:notifier_test_util', | 663 '../jingle/jingle.gyp:notifier_test_util', |
| 610 '../net/net.gyp:net_test_support', | 664 '../net/net.gyp:net_test_support', |
| 611 '../testing/gmock.gyp:gmock', | 665 '../testing/gmock.gyp:gmock', |
| 612 '../testing/gtest.gyp:gtest', | 666 '../testing/gtest.gyp:gtest', |
| 613 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', | 667 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', |
| 614 '../third_party/libjingle/libjingle.gyp:libjingle', | 668 '../third_party/libjingle/libjingle.gyp:libjingle', |
| 615 'sync', | 669 'sync', |
| 616 'sync_notifier', | |
| 617 'test_support_sync_notifier', | 670 'test_support_sync_notifier', |
| 618 ], | 671 ], |
| 619 # Propagate all dependencies since the actual compilation | 672 # Propagate all dependencies since the actual compilation |
| 620 # happens in the dependents. | 673 # happens in the dependents. |
| 621 'export_dependent_settings': [ | 674 'export_dependent_settings': [ |
| 622 '../base/base.gyp:base', | 675 '../base/base.gyp:base', |
| 623 '../jingle/jingle.gyp:notifier_test_util', | 676 '../jingle/jingle.gyp:notifier_test_util', |
| 624 '../net/net.gyp:net_test_support', | 677 '../net/net.gyp:net_test_support', |
| 625 '../testing/gmock.gyp:gmock', | 678 '../testing/gmock.gyp:gmock', |
| 626 '../testing/gtest.gyp:gtest', | 679 '../testing/gtest.gyp:gtest', |
| 627 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', | 680 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', |
| 628 '../third_party/libjingle/libjingle.gyp:libjingle', | 681 '../third_party/libjingle/libjingle.gyp:libjingle', |
| 629 'sync', | 682 'sync', |
| 630 'sync_notifier', | |
| 631 'test_support_sync_notifier', | 683 'test_support_sync_notifier', |
| 632 ], | 684 ], |
| 633 'direct_dependent_settings': { | 685 'direct_dependent_settings': { |
| 634 'variables': { 'enable_wexit_time_destructors': 1, }, | 686 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 635 'include_dirs': [ | 687 'include_dirs': [ |
| 636 '..', | 688 '..', |
| 637 ], | 689 ], |
| 638 'sources': [ | 690 'sources': [ |
| 639 'notifier/sync_notifier_factory_unittest.cc', | 691 'notifier/sync_notifier_factory_unittest.cc', |
| 640 ], | 692 ], |
| 641 'conditions': [ | 693 'conditions': [ |
| 642 ['OS != "android"', { | 694 ['OS != "android"', { |
| 643 'sources': [ | 695 'sources': [ |
| 644 'notifier/chrome_invalidation_client_unittest.cc', | 696 'notifier/chrome_invalidation_client_unittest.cc', |
| 645 'notifier/chrome_system_resources_unittest.cc', | 697 'notifier/chrome_system_resources_unittest.cc', |
| 646 'notifier/invalidation_notifier_unittest.cc', | 698 'notifier/invalidation_notifier_unittest.cc', |
| 647 'notifier/non_blocking_invalidation_notifier_unittest.cc', | 699 'notifier/non_blocking_invalidation_notifier_unittest.cc', |
| 648 'notifier/p2p_notifier_unittest.cc', | 700 'notifier/p2p_notifier_unittest.cc', |
| 649 'notifier/push_client_channel_unittest.cc', | 701 'notifier/push_client_channel_unittest.cc', |
| 650 'notifier/registration_manager_unittest.cc', | 702 'notifier/registration_manager_unittest.cc', |
| 651 ], | 703 ], |
| 652 }], | 704 }], |
| 653 ], | 705 ], |
| 654 }, | 706 }, |
| 655 }, | 707 }, |
| 656 | 708 |
| 657 # Unit tests for the 'syncapi_core' target. This cannot be a static | 709 # Unit tests for the 'sync_internal_api' target. This cannot be a static |
| 658 # library because the unit test files have to be compiled directly | 710 # library because the unit test files have to be compiled directly |
| 659 # into the executable, so we push the target files to the | 711 # into the executable, so we push the target files to the |
| 660 # depending executable target via direct_dependent_settings. | 712 # depending executable target via direct_dependent_settings. |
| 661 { | 713 { |
| 662 'target_name': 'syncapi_core_tests', | 714 'target_name': 'sync_internal_api_tests', |
| 663 'type': 'none', | 715 'type': 'none', |
| 664 # We only want unit test executables to include this target. | 716 # We only want unit test executables to include this target. |
| 665 'suppress_wildcard': 1, | 717 'suppress_wildcard': 1, |
| 666 'dependencies': [ | 718 'dependencies': [ |
| 667 '../base/base.gyp:base', | 719 '../base/base.gyp:base', |
| 668 '../net/net.gyp:net', | 720 '../net/net.gyp:net', |
| 669 '../net/net.gyp:net_test_support', | 721 '../net/net.gyp:net_test_support', |
| 670 '../testing/gmock.gyp:gmock', | 722 '../testing/gmock.gyp:gmock', |
| 671 '../testing/gtest.gyp:gtest', | 723 '../testing/gtest.gyp:gtest', |
| 672 'protocol/sync_proto.gyp:sync_proto', | |
| 673 'sync', | 724 'sync', |
| 674 'sync_notifier', | 725 'test_support_sync_internal_api', |
| 675 'syncapi_core', | |
| 676 'test_support_syncapi_core', | |
| 677 ], | 726 ], |
| 678 # Propagate all dependencies since the actual compilation | 727 # Propagate all dependencies since the actual compilation |
| 679 # happens in the dependents. | 728 # happens in the dependents. |
| 680 'export_dependent_settings': [ | 729 'export_dependent_settings': [ |
| 681 '../base/base.gyp:base', | 730 '../base/base.gyp:base', |
| 682 '../net/net.gyp:net', | 731 '../net/net.gyp:net', |
| 683 '../net/net.gyp:net_test_support', | 732 '../net/net.gyp:net_test_support', |
| 684 '../testing/gmock.gyp:gmock', | 733 '../testing/gmock.gyp:gmock', |
| 685 '../testing/gtest.gyp:gtest', | 734 '../testing/gtest.gyp:gtest', |
| 686 'protocol/sync_proto.gyp:sync_proto', | |
| 687 'sync', | 735 'sync', |
| 688 'sync_notifier', | 736 'test_support_sync_internal_api', |
| 689 'syncapi_core', | |
| 690 'test_support_syncapi_core', | |
| 691 ], | 737 ], |
| 692 'direct_dependent_settings': { | 738 'direct_dependent_settings': { |
| 693 'variables': { 'enable_wexit_time_destructors': 1, }, | 739 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 694 'include_dirs': [ | 740 'include_dirs': [ |
| 695 '..', | 741 '..', |
| 696 ], | 742 ], |
| 697 'sources': [ | 743 'sources': [ |
| 698 'internal_api/public/change_record_unittest.cc', | 744 'internal_api/public/change_record_unittest.cc', |
| 699 'internal_api/debug_info_event_listener_unittest.cc', | 745 'internal_api/debug_info_event_listener_unittest.cc', |
| 700 'internal_api/http_bridge_unittest.cc', | 746 'internal_api/http_bridge_unittest.cc', |
| 701 'internal_api/js_mutation_event_observer_unittest.cc', | 747 'internal_api/js_mutation_event_observer_unittest.cc', |
| 702 'internal_api/js_sync_manager_observer_unittest.cc', | 748 'internal_api/js_sync_manager_observer_unittest.cc', |
| 703 'internal_api/syncapi_server_connection_manager_unittest.cc', | 749 'internal_api/syncapi_server_connection_manager_unittest.cc', |
| 704 'internal_api/syncapi_unittest.cc', | 750 'internal_api/syncapi_unittest.cc', |
| 705 ], | 751 ], |
| 706 }, | 752 }, |
| 707 }, | 753 }, |
| 708 | 754 |
| 709 # Unit tests for the 'syncapi_service' target. This cannot be a static | 755 # Unit tests for the 'sync_api' target. This cannot be a static |
| 710 # library because the unit test files have to be compiled directly | 756 # library because the unit test files have to be compiled directly |
| 711 # into the executable, so we push the target files to the | 757 # into the executable, so we push the target files to the |
| 712 # depending executable target via direct_dependent_settings. | 758 # depending executable target via direct_dependent_settings. |
| 713 { | 759 { |
| 714 'target_name': 'syncapi_service_tests', | 760 'target_name': 'sync_api_tests', |
| 715 'type': 'none', | 761 'type': 'none', |
| 716 # We only want unit test executables to include this target. | 762 # We only want unit test executables to include this target. |
| 717 'suppress_wildcard': 1, | 763 'suppress_wildcard': 1, |
| 718 'dependencies': [ | 764 'dependencies': [ |
| 719 '../base/base.gyp:base', | 765 '../base/base.gyp:base', |
| 720 '../testing/gtest.gyp:gtest', | 766 '../testing/gtest.gyp:gtest', |
| 721 'protocol/sync_proto.gyp:sync_proto', | |
| 722 'sync', | 767 'sync', |
| 723 'syncapi_service', | 768 'test_support_sync_api', |
| 724 'test_support_syncapi_service', | |
| 725 ], | 769 ], |
| 726 # Propagate all dependencies since the actual compilation | 770 # Propagate all dependencies since the actual compilation |
| 727 # happens in the dependents. | 771 # happens in the dependents. |
| 728 'export_dependent_settings': [ | 772 'export_dependent_settings': [ |
| 729 '../base/base.gyp:base', | 773 '../base/base.gyp:base', |
| 730 '../testing/gtest.gyp:gtest', | 774 '../testing/gtest.gyp:gtest', |
| 731 'protocol/sync_proto.gyp:sync_proto', | |
| 732 'sync', | 775 'sync', |
| 733 'syncapi_service', | 776 'test_support_sync_api', |
| 734 'test_support_syncapi_service', | |
| 735 ], | 777 ], |
| 736 'direct_dependent_settings': { | 778 'direct_dependent_settings': { |
| 737 'variables': { 'enable_wexit_time_destructors': 1, }, | 779 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 738 'include_dirs': [ | 780 'include_dirs': [ |
| 739 '..', | 781 '..', |
| 740 ], | 782 ], |
| 741 'sources': [ | 783 'sources': [ |
| 742 'api/sync_change_unittest.cc', | 784 'api/sync_change_unittest.cc', |
| 743 'api/sync_error_unittest.cc', | 785 'api/sync_error_unittest.cc', |
| 744 ], | 786 ], |
| 745 }, | 787 }, |
| 746 }, | 788 }, |
| 747 | 789 |
| 748 # The unit test executable for sync tests. | 790 # The unit test executable for sync tests. |
| 749 { | 791 { |
| 750 'target_name': 'sync_unit_tests', | 792 'target_name': 'sync_unit_tests', |
| 751 'type': '<(gtest_target_type)', | 793 'type': '<(gtest_target_type)', |
| 752 'dependencies': [ | 794 'dependencies': [ |
| 753 '../base/base.gyp:run_all_unittests', | 795 '../base/base.gyp:run_all_unittests', |
| 754 'sync_tests', | 796 'sync_core_tests', |
| 755 'sync_notifier_tests', | 797 'sync_notifier_tests', |
| 756 'syncapi_core_tests', | 798 'sync_internal_api_tests', |
| 757 'syncapi_service_tests', | 799 'sync_api_tests', |
| 758 ], | 800 ], |
| 759 # TODO(akalin): This is needed because histogram.cc uses | 801 # TODO(akalin): This is needed because histogram.cc uses |
| 760 # leak_annotations.h, which pulls this in. Make 'base' | 802 # leak_annotations.h, which pulls this in. Make 'base' |
| 761 # propagate this dependency. | 803 # propagate this dependency. |
| 762 'conditions': [ | 804 'conditions': [ |
| 763 ['OS=="linux" and linux_use_tcmalloc==1', { | 805 ['OS=="linux" and linux_use_tcmalloc==1', { |
| 764 'dependencies': [ | 806 'dependencies': [ |
| 765 '../base/allocator/allocator.gyp:allocator', | 807 '../base/allocator/allocator.gyp:allocator', |
| 766 ], | 808 ], |
| 767 }], | 809 }], |
| 768 ['OS=="linux" and chromeos==1', { | 810 ['OS=="linux" and chromeos==1', { |
| 769 # TODO(kochi): Remove this once we get rid of dependency from | 811 # TODO(kochi): Remove this once we get rid of dependency from |
| 770 # get_session_name.cc. | 812 # get_session_name.cc. |
| 771 'dependencies': [ | 813 'dependencies': [ |
| 772 '../chrome/chrome.gyp:browser', | 814 '../chrome/chrome.gyp:browser', |
| 773 ], | 815 ], |
| 774 }], | 816 }], |
| 775 ['OS == "android" and gtest_target_type == "shared_library"', { | 817 ['OS == "android" and gtest_target_type == "shared_library"', { |
| 776 'dependencies': [ | 818 'dependencies': [ |
| 777 '../testing/android/native_test.gyp:native_test_native_code', | 819 '../testing/android/native_test.gyp:native_test_native_code', |
| 778 ], | 820 ], |
| 779 }], | 821 }], |
| 780 ], | 822 ], |
| 781 }, | 823 }, |
| 782 | 824 |
| 825 #################################################################### | |
| 826 # Helper executables | |
| 827 #################################################################### | |
| 828 | |
| 783 # A tool to listen to sync notifications and print them out. | 829 # A tool to listen to sync notifications and print them out. |
| 784 { | 830 { |
| 785 'target_name': 'sync_listen_notifications', | 831 'target_name': 'sync_listen_notifications', |
| 786 'type': 'executable', | 832 'type': 'executable', |
| 787 'dependencies': [ | 833 'dependencies': [ |
| 788 '../base/base.gyp:base', | 834 '../base/base.gyp:base', |
| 789 '../jingle/jingle.gyp:notifier', | 835 '../jingle/jingle.gyp:notifier', |
| 790 '../net/net.gyp:net', | 836 '../net/net.gyp:net', |
| 791 '../net/net.gyp:net_test_support', | 837 '../net/net.gyp:net_test_support', |
| 792 'sync', | 838 'sync', |
| 793 'sync_notifier', | |
| 794 ], | 839 ], |
| 795 'sources': [ | 840 'sources': [ |
| 796 'tools/sync_listen_notifications.cc', | 841 'tools/sync_listen_notifications.cc', |
| 797 ], | 842 ], |
| 798 }, | 843 }, |
| 799 | 844 |
| 800 # A standalone command-line sync client. | 845 # A standalone command-line sync client. |
| 801 { | 846 { |
| 802 'target_name': 'sync_client', | 847 'target_name': 'sync_client', |
| 803 'type': 'executable', | 848 'type': 'executable', |
| 804 'defines': [ | |
| 805 'SYNC_TEST', | |
| 806 ], | |
| 807 'dependencies': [ | 849 'dependencies': [ |
| 808 '../base/base.gyp:base', | 850 '../base/base.gyp:base', |
| 809 '../jingle/jingle.gyp:notifier', | 851 '../jingle/jingle.gyp:notifier', |
| 810 '../net/net.gyp:net', | 852 '../net/net.gyp:net', |
| 811 '../net/net.gyp:net_test_support', | 853 '../net/net.gyp:net_test_support', |
| 812 'sync', | 854 'sync', |
| 813 'sync_notifier', | |
| 814 'syncapi_core', | |
| 815 ], | 855 ], |
| 816 'sources': [ | 856 'sources': [ |
| 817 'tools/sync_client.cc', | 857 'tools/sync_client.cc', |
| 818 ], | 858 ], |
| 819 }, | 859 }, |
| 820 ], | 860 ], |
| 861 | |
| 821 'conditions': [ | 862 'conditions': [ |
| 822 # Special target to wrap a gtest_target_type==shared_library | 863 # Special target to wrap a gtest_target_type==shared_library |
| 823 # sync_unit_tests into an android apk for execution. | 864 # sync_unit_tests into an android apk for execution. |
| 824 ['OS == "android" and gtest_target_type == "shared_library"', { | 865 ['OS == "android" and gtest_target_type == "shared_library"', { |
| 825 'targets': [ | 866 'targets': [ |
| 826 { | 867 { |
| 827 'target_name': 'sync_unit_tests_apk', | 868 'target_name': 'sync_unit_tests_apk', |
| 828 'type': 'none', | 869 'type': 'none', |
| 829 'dependencies': [ | 870 'dependencies': [ |
| 830 '../base/base.gyp:base_java', | 871 '../base/base.gyp:base_java', |
| 831 'sync_unit_tests', | 872 'sync_unit_tests', |
| 832 ], | 873 ], |
| 833 'variables': { | 874 'variables': { |
| 834 'test_suite_name': 'sync_unit_tests', | 875 'test_suite_name': 'sync_unit_tests', |
| 835 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sync_unit _tests<(SHARED_LIB_SUFFIX)', | 876 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sync_unit _tests<(SHARED_LIB_SUFFIX)', |
| 836 'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', ] , | 877 'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', ] , |
| 837 }, | 878 }, |
| 838 'includes': [ '../build/apk_test.gypi' ], | 879 'includes': [ '../build/apk_test.gypi' ], |
| 839 }, | 880 }, |
| 840 ], | 881 ], |
| 841 }], | 882 }], |
| 842 ], | 883 ], |
| 843 } | 884 } |
| OLD | NEW |