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 { | 5 { |
| 6 'includes': [ | 6 'includes': [ |
| 7 'remoting_host_linux.gypi', | 7 'remoting_host_linux.gypi', |
| 8 'remoting_host_mac.gypi', | 8 'remoting_host_mac.gypi', |
| 9 'remoting_host_win.gypi', | 9 'remoting_host_win.gypi', |
| 10 ], | 10 ], |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 418 'host/setup/daemon_controller.cc', | 418 'host/setup/daemon_controller.cc', |
| 419 'host/setup/daemon_controller.h', | 419 'host/setup/daemon_controller.h', |
| 420 'host/setup/daemon_controller_delegate_linux.cc', | 420 'host/setup/daemon_controller_delegate_linux.cc', |
| 421 'host/setup/daemon_controller_delegate_linux.h', | 421 'host/setup/daemon_controller_delegate_linux.h', |
| 422 'host/setup/daemon_controller_delegate_mac.h', | 422 'host/setup/daemon_controller_delegate_mac.h', |
| 423 'host/setup/daemon_controller_delegate_mac.mm', | 423 'host/setup/daemon_controller_delegate_mac.mm', |
| 424 'host/setup/daemon_controller_delegate_win.cc', | 424 'host/setup/daemon_controller_delegate_win.cc', |
| 425 'host/setup/daemon_controller_delegate_win.h', | 425 'host/setup/daemon_controller_delegate_win.h', |
| 426 'host/setup/daemon_installer_win.cc', | 426 'host/setup/daemon_installer_win.cc', |
| 427 'host/setup/daemon_installer_win.h', | 427 'host/setup/daemon_installer_win.h', |
| 428 'host/setup/me2me_native_messaging_host.cc', | |
| 429 'host/setup/me2me_native_messaging_host.h', | |
|
rmsousa
2014/07/16 23:06:00
Is this a leftover from another CL? unrelated clea
Sergey Ulanov
2014/07/17 01:47:58
Yes.
| |
| 430 'host/setup/me2me_native_messaging_host_main.cc', | |
| 431 'host/setup/me2me_native_messaging_host_main.h', | |
| 428 'host/setup/oauth_client.cc', | 432 'host/setup/oauth_client.cc', |
| 429 'host/setup/oauth_client.h', | 433 'host/setup/oauth_client.h', |
| 430 'host/setup/oauth_helper.cc', | 434 'host/setup/oauth_helper.cc', |
| 431 'host/setup/oauth_helper.h', | 435 'host/setup/oauth_helper.h', |
| 432 'host/setup/pin_validator.cc', | 436 'host/setup/pin_validator.cc', |
| 433 'host/setup/pin_validator.h', | 437 'host/setup/pin_validator.h', |
| 434 'host/setup/service_client.cc', | 438 'host/setup/service_client.cc', |
| 435 'host/setup/service_client.h', | 439 'host/setup/service_client.h', |
| 436 'host/setup/test_util.cc', | 440 'host/setup/test_util.cc', |
| 437 'host/setup/test_util.h', | 441 'host/setup/test_util.h', |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 464 'remoting_resources', | 468 'remoting_resources', |
| 465 ], | 469 ], |
| 466 'defines': [ | 470 'defines': [ |
| 467 'VERSION=<(version_full)', | 471 'VERSION=<(version_full)', |
| 468 ], | 472 ], |
| 469 'sources': [ | 473 'sources': [ |
| 470 'host/it2me/it2me_host.cc', | 474 'host/it2me/it2me_host.cc', |
| 471 'host/it2me/it2me_host.h', | 475 'host/it2me/it2me_host.h', |
| 472 'host/it2me/it2me_native_messaging_host.cc', | 476 'host/it2me/it2me_native_messaging_host.cc', |
| 473 'host/it2me/it2me_native_messaging_host.h', | 477 'host/it2me/it2me_native_messaging_host.h', |
| 478 'host/it2me/it2me_native_messaging_host_main.cc', | |
| 479 'host/it2me/it2me_native_messaging_host_main.h', | |
| 474 ], | 480 ], |
| 475 }, # end of target 'remoting_it2me_host_static' | 481 }, # end of target 'remoting_it2me_host_static' |
| 476 | 482 |
| 477 # Generates native messaging manifest files. | 483 # Generates native messaging manifest files. |
| 478 { | 484 { |
| 479 'target_name': 'remoting_native_messaging_manifests', | 485 'target_name': 'remoting_native_messaging_manifests', |
| 480 'type': 'none', | 486 'type': 'none', |
| 481 'conditions': [ | 487 'conditions': [ |
| 482 [ 'OS == "win"', { | 488 [ 'OS == "win"', { |
| 483 'variables': { | 489 'variables': { |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 672 'remoting_breakpad', | 678 'remoting_breakpad', |
| 673 'remoting_host', | 679 'remoting_host', |
| 674 'remoting_host_setup_base', | 680 'remoting_host_setup_base', |
| 675 'remoting_infoplist_strings', | 681 'remoting_infoplist_strings', |
| 676 'remoting_native_messaging_base', | 682 'remoting_native_messaging_base', |
| 677 ], | 683 ], |
| 678 'defines': [ | 684 'defines': [ |
| 679 'VERSION=<(version_full)', | 685 'VERSION=<(version_full)', |
| 680 ], | 686 ], |
| 681 'sources': [ | 687 'sources': [ |
| 682 'host/setup/me2me_native_messaging_host.cc', | |
| 683 'host/setup/me2me_native_messaging_host.h', | |
| 684 'host/setup/me2me_native_messaging_host_entry_point.cc', | 688 'host/setup/me2me_native_messaging_host_entry_point.cc', |
| 685 'host/setup/me2me_native_messaging_host_main.cc', | |
| 686 'host/setup/me2me_native_messaging_host_main.h', | |
| 687 ], | 689 ], |
| 688 'conditions': [ | 690 'conditions': [ |
| 689 ['OS=="linux" and use_allocator!="none"', { | 691 ['OS=="linux" and use_allocator!="none"', { |
| 690 'dependencies': [ | 692 'dependencies': [ |
| 691 '../base/allocator/allocator.gyp:allocator', | 693 '../base/allocator/allocator.gyp:allocator', |
| 692 ], | 694 ], |
| 693 }], | 695 }], |
| 694 ['OS=="mac"', { | 696 ['OS=="mac"', { |
| 695 'mac_bundle': 1, | 697 'mac_bundle': 1, |
| 696 'variables': { | 698 'variables': { |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 761 'remoting_host', | 763 'remoting_host', |
| 762 'remoting_it2me_host_static', | 764 'remoting_it2me_host_static', |
| 763 'remoting_native_messaging_base', | 765 'remoting_native_messaging_base', |
| 764 'remoting_protocol', | 766 'remoting_protocol', |
| 765 ], | 767 ], |
| 766 'defines': [ | 768 'defines': [ |
| 767 'VERSION=<(version_full)', | 769 'VERSION=<(version_full)', |
| 768 ], | 770 ], |
| 769 'sources': [ | 771 'sources': [ |
| 770 'host/it2me/it2me_native_messaging_host_entry_point.cc', | 772 'host/it2me/it2me_native_messaging_host_entry_point.cc', |
| 771 'host/it2me/it2me_native_messaging_host_main.cc', | |
| 772 'host/it2me/it2me_native_messaging_host_main.h', | |
| 773 ], | 773 ], |
| 774 'conditions': [ | 774 'conditions': [ |
| 775 ['OS=="linux"', { | 775 ['OS=="linux"', { |
| 776 'dependencies': [ | 776 'dependencies': [ |
| 777 # Always use GTK on Linux, even for Aura builds. | 777 # Always use GTK on Linux, even for Aura builds. |
| 778 '../build/linux/system.gyp:gtk', | 778 '../build/linux/system.gyp:gtk', |
| 779 ], | 779 ], |
| 780 }], | 780 }], |
| 781 ['OS=="linux" and use_allocator!="none"', { | 781 ['OS=="linux" and use_allocator!="none"', { |
| 782 'dependencies': [ | 782 'dependencies': [ |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 840 }], # mac_breakpad==1 | 840 }], # mac_breakpad==1 |
| 841 ], # conditions | 841 ], # conditions |
| 842 }], # OS=mac | 842 }], # OS=mac |
| 843 ], | 843 ], |
| 844 }, # end of target 'remoting_it2me_native_messaging_host' | 844 }, # end of target 'remoting_it2me_native_messaging_host' |
| 845 ], # end of 'targets' | 845 ], # end of 'targets' |
| 846 }], # OS!="win" | 846 }], # OS!="win" |
| 847 | 847 |
| 848 ], # end of 'conditions' | 848 ], # end of 'conditions' |
| 849 } | 849 } |
| OLD | NEW |