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 'variables': { | 6 'variables': { |
7 # TODO(dmaclach): can we pick this up some other way? Right now it's | 7 # TODO(dmaclach): can we pick this up some other way? Right now it's |
8 # duplicated from chrome.gyp | 8 # duplicated from chrome.gyp |
9 'chromium_code': 1, | 9 'chromium_code': 1, |
10 | 10 |
(...skipping 11 matching lines...) Expand all Loading... |
22 'version_short': | 22 'version_short': |
23 '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@").' | 23 '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@").' |
24 '<!(python <(version_py_path) -f <(chrome_version_path) -t "@BUILD@")', | 24 '<!(python <(version_py_path) -f <(chrome_version_path) -t "@BUILD@")', |
25 | 25 |
26 'branding_path': '../remoting/branding_<(branding)', | 26 'branding_path': '../remoting/branding_<(branding)', |
27 'copyright_info': '<!(python <(version_py_path) -f <(branding_path) -t "@COP
YRIGHT@")', | 27 'copyright_info': '<!(python <(version_py_path) -f <(branding_path) -t "@COP
YRIGHT@")', |
28 | 28 |
29 # Use consistent strings across all platforms. | 29 # Use consistent strings across all platforms. |
30 # These values must match host/plugin/constants.h | 30 # These values must match host/plugin/constants.h |
31 'host_plugin_mime_type': 'application/vnd.chromium.remoting-host', | 31 'host_plugin_mime_type': 'application/vnd.chromium.remoting-host', |
32 'host_plugin_description': '<!(python <(version_py_path) -f <(branding_path)
-t "@HOST_PLUGIN_FILE_DESCRIPTION@")', | 32 'host_plugin_description': '<!(python <(version_py_path) -f <(branding_path)
-t "@HOST_PLUGIN_DESCRIPTION@")', |
33 'host_plugin_name': '<!(python <(version_py_path) -f <(branding_path) -t "@H
OST_PLUGIN_FILE_NAME@")', | 33 'host_plugin_name': '<!(python <(version_py_path) -f <(branding_path) -t "@H
OST_PLUGIN_FILE_NAME@")', |
34 | 34 |
35 'conditions': [ | 35 'conditions': [ |
36 ['OS=="mac"', { | 36 ['OS=="mac"', { |
37 'mac_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@
MAC_BUNDLE_ID@")', | 37 'mac_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@
MAC_BUNDLE_ID@")', |
38 'mac_creator': '<!(python <(version_py_path) -f <(branding_path) -t "@MA
C_CREATOR@")', | 38 'mac_creator': '<!(python <(version_py_path) -f <(branding_path) -t "@MA
C_CREATOR@")', |
39 'host_plugin_extension': 'plugin', | 39 'host_plugin_extension': 'plugin', |
40 'host_plugin_prefix': '', | 40 'host_plugin_prefix': '', |
41 }], | 41 }], |
42 ['os_posix == 1 and OS != "mac" and target_arch == "ia32"', { | 42 ['os_posix == 1 and OS != "mac" and target_arch == "ia32"', { |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 ], | 200 ], |
201 'include_dirs': [ | 201 'include_dirs': [ |
202 '..', # Root of Chrome checkout | 202 '..', # Root of Chrome checkout |
203 ], | 203 ], |
204 'conditions': [ | 204 'conditions': [ |
205 ['remoting_audio == 1', { | 205 ['remoting_audio == 1', { |
206 'defines': [ | 206 'defines': [ |
207 'ENABLE_REMOTING_AUDIO', | 207 'ENABLE_REMOTING_AUDIO', |
208 ], | 208 ], |
209 }], | 209 }], |
210 ['remoting_multi_process == 1', { | 210 ['remoting_multi_process != 0', { |
211 'defines': [ | 211 'defines': [ |
212 'REMOTING_MULTI_PROCESS', | 212 'REMOTING_MULTI_PROCESS', |
213 ], | 213 ], |
214 }], | 214 }], |
215 ], | 215 ], |
216 }, | 216 }, |
217 | 217 |
218 'conditions': [ | 218 'conditions': [ |
219 ['OS=="linux"', { | 219 ['OS=="linux"', { |
220 'targets': [ | 220 'targets': [ |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
303 'remoting_host_prefpane', | 303 'remoting_host_prefpane', |
304 'remoting_host_uninstaller', | 304 'remoting_host_uninstaller', |
305 'remoting_me2me_host', | 305 'remoting_me2me_host', |
306 ], | 306 ], |
307 'sources': [ | 307 'sources': [ |
308 'host/installer/build-installer-archive.py', | 308 'host/installer/build-installer-archive.py', |
309 '<@(remoting_host_installer_mac_files)', | 309 '<@(remoting_host_installer_mac_files)', |
310 ], | 310 ], |
311 'variables': { | 311 'variables': { |
312 'host_name': '<!(python <(version_py_path) -f <(branding_path) -t "@
HOST_PLUGIN_FILE_NAME@")', | 312 'host_name': '<!(python <(version_py_path) -f <(branding_path) -t "@
HOST_PLUGIN_FILE_NAME@")', |
313 'host_service_name': '<!(python <(version_py_path) -f <(branding_pat
h) -t "@HOST_SERVICE_FILE_NAME@")', | 313 'host_service_name': '<!(python <(version_py_path) -f <(branding_pat
h) -t "@DAEMON_FILE_NAME@")', |
314 'host_uninstaller_name': '<!(python <(version_py_path) -f <(branding
_path) -t "@MAC_UNINSTALLER_NAME@")', | 314 'host_uninstaller_name': '<!(python <(version_py_path) -f <(branding
_path) -t "@MAC_UNINSTALLER_NAME@")', |
315 'bundle_prefix': '<!(python <(version_py_path) -f <(branding_path) -
t "@MAC_UNINSTALLER_BUNDLE_PREFIX@")', | 315 'bundle_prefix': '<!(python <(version_py_path) -f <(branding_path) -
t "@MAC_UNINSTALLER_BUNDLE_PREFIX@")', |
316 }, | 316 }, |
317 'actions': [ | 317 'actions': [ |
318 { | 318 { |
319 'action_name': 'Zip installer files for signing', | 319 'action_name': 'Zip installer files for signing', |
320 'temp_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting-me2me-ho
st', | 320 'temp_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting-me2me-ho
st', |
321 'zip_path': '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip', | 321 'zip_path': '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip', |
322 'variables': { | 322 'variables': { |
323 'host_name_nospace': '<!(echo <(host_name) | sed "s/ //g")', | 323 'host_name_nospace': '<!(echo <(host_name) | sed "s/ //g")', |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
533 '<(INTERMEDIATE_DIR)', | 533 '<(INTERMEDIATE_DIR)', |
534 ], | 534 ], |
535 'dependencies': [ | 535 'dependencies': [ |
536 '../base/base.gyp:base', | 536 '../base/base.gyp:base', |
537 'remoting_breakpad', | 537 'remoting_breakpad', |
538 'remoting_elevated_controller', | 538 'remoting_elevated_controller', |
539 'remoting_protocol', | 539 'remoting_protocol', |
540 'remoting_version_resources', | 540 'remoting_version_resources', |
541 ], | 541 ], |
542 'sources': [ | 542 'sources': [ |
543 '<(SHARED_INTERMEDIATE_DIR)/remoting/elevated_controller_version.rc'
, | 543 '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_controller_version.rc'
, |
544 'host/branding.cc', | 544 'host/branding.cc', |
545 'host/branding.h', | 545 'host/branding.h', |
546 'host/pin_hash.cc', | 546 'host/pin_hash.cc', |
547 'host/pin_hash.h', | 547 'host/pin_hash.h', |
548 'host/usage_stats_consent.h', | 548 'host/usage_stats_consent.h', |
549 'host/usage_stats_consent_win.cc', | 549 'host/usage_stats_consent_win.cc', |
550 'host/verify_config_window_win.cc', | 550 'host/verify_config_window_win.cc', |
551 'host/verify_config_window_win.h', | 551 'host/verify_config_window_win.h', |
552 'host/win/elevated_controller.rc', | 552 'host/win/elevated_controller.rc', |
553 'host/win/elevated_controller_module.cc', | 553 'host/win/elevated_controller_module.cc', |
(...skipping 26 matching lines...) Expand all Loading... |
580 'dependencies': [ | 580 'dependencies': [ |
581 '../base/base.gyp:base', | 581 '../base/base.gyp:base', |
582 '../base/base.gyp:base_static', | 582 '../base/base.gyp:base_static', |
583 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations', | 583 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations', |
584 '../ipc/ipc.gyp:ipc', | 584 '../ipc/ipc.gyp:ipc', |
585 'remoting_base', | 585 'remoting_base', |
586 'remoting_breakpad', | 586 'remoting_breakpad', |
587 'remoting_version_resources', | 587 'remoting_version_resources', |
588 ], | 588 ], |
589 'sources': [ | 589 'sources': [ |
590 '<(SHARED_INTERMEDIATE_DIR)/remoting/host_service_version.rc', | 590 '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_daemon_version.rc', |
591 'base/scoped_sc_handle_win.h', | 591 'base/scoped_sc_handle_win.h', |
592 'host/branding.cc', | 592 'host/branding.cc', |
593 'host/branding.h', | 593 'host/branding.h', |
594 'host/chromoting_messages.cc', | 594 'host/chromoting_messages.cc', |
595 'host/chromoting_messages.h', | 595 'host/chromoting_messages.h', |
596 'host/config_file_watcher.cc', | 596 'host/config_file_watcher.cc', |
597 'host/config_file_watcher.h', | 597 'host/config_file_watcher.h', |
598 'host/constants.h', | 598 'host/constants.h', |
599 'host/constants_win.cc', | 599 'host/constants_win.cc', |
600 'host/daemon_process.cc', | 600 'host/daemon_process.cc', |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
646 '<(DEPTH)/build/util/LASTCHANGE', | 646 '<(DEPTH)/build/util/LASTCHANGE', |
647 '<(version_path)', | 647 '<(version_path)', |
648 '<(chrome_version_path)', | 648 '<(chrome_version_path)', |
649 ], | 649 ], |
650 'direct_dependent_settings': { | 650 'direct_dependent_settings': { |
651 'include_dirs': [ | 651 'include_dirs': [ |
652 '<(SHARED_INTERMEDIATE_DIR)/remoting', | 652 '<(SHARED_INTERMEDIATE_DIR)/remoting', |
653 ], | 653 ], |
654 }, | 654 }, |
655 'sources': [ | 655 'sources': [ |
656 'host/plugin/host_plugin.ver', | 656 'host/plugin/remoting_host_plugin.ver', |
657 'host/remoting_me2me_host.ver', | 657 'host/remoting_desktop.ver', |
658 'host/win/elevated_controller.ver', | 658 'host/remoting_host_me2me.ver', |
659 'host/win/host_service.ver', | 659 'host/win/remoting_controller.ver', |
| 660 'host/win/remoting_daemon.ver', |
660 ], | 661 ], |
661 'rules': [ | 662 'rules': [ |
662 { | 663 { |
663 'rule_name': 'version', | 664 'rule_name': 'version', |
664 'extension': 'ver', | 665 'extension': 'ver', |
665 'variables': { | 666 'variables': { |
666 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', | 667 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', |
667 'template_input_path': 'version.rc.version', | 668 'template_input_path': 'version.rc.version', |
668 }, | 669 }, |
669 'inputs': [ | 670 'inputs': [ |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
710 'remoting_me2me_host', | 711 'remoting_me2me_host', |
711 ], | 712 ], |
712 'sources': [ | 713 'sources': [ |
713 'host/win/chromoting.wxs', | 714 'host/win/chromoting.wxs', |
714 ], | 715 ], |
715 'outputs': [ | 716 'outputs': [ |
716 '<(PRODUCT_DIR)/chromoting.msi', | 717 '<(PRODUCT_DIR)/chromoting.msi', |
717 ], | 718 ], |
718 'wix_defines' : [ | 719 'wix_defines' : [ |
719 '-dBranding=<(branding)', | 720 '-dBranding=<(branding)', |
| 721 '-dRemotingMultiProcess=<(remoting_multi_process)', |
| 722 ], |
| 723 'wix_inputs' : [ |
| 724 '<(PRODUCT_DIR)/remoting_host_controller.exe', |
| 725 '<(PRODUCT_DIR)/remoting_me2me_host.exe', |
| 726 '<(PRODUCT_DIR)/remoting_service.exe', |
| 727 '<(sas_dll_path)/sas.dll', |
| 728 'resources/chromoting.ico', |
720 ], | 729 ], |
721 'conditions': [ | 730 'conditions': [ |
| 731 ['remoting_multi_process != 0', { |
| 732 'dependencies': [ |
| 733 'remoting_desktop', |
| 734 ], |
| 735 'wix_inputs' : [ |
| 736 '<(PRODUCT_DIR)/remoting_desktop.exe', |
| 737 ], |
| 738 }], |
722 ['buildtype == "Official"', { | 739 ['buildtype == "Official"', { |
723 'wix_defines': [ | 740 'wix_defines': [ |
724 '-dOfficialBuild=1', | 741 '-dOfficialBuild=1', |
725 ], | 742 ], |
726 }], | 743 }], |
727 ], | 744 ], |
728 'rules': [ | 745 'rules': [ |
729 { | 746 { |
730 'rule_name': 'candle_and_light', | 747 'rule_name': 'candle_and_light', |
731 'extension': 'wxs', | 748 'extension': 'wxs', |
732 'inputs': [ | 749 'inputs': [ |
733 '<(PRODUCT_DIR)/remoting_host_controller.exe', | 750 '<@(_wix_inputs)', |
734 '<(PRODUCT_DIR)/remoting_me2me_host.exe', | |
735 '<(PRODUCT_DIR)/remoting_service.exe', | |
736 '<(sas_dll_path)/sas.dll', | |
737 'resources/chromoting.ico', | |
738 'tools/candle_and_light.py', | 751 'tools/candle_and_light.py', |
739 ], | 752 ], |
740 'outputs': [ | 753 'outputs': [ |
741 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi', | 754 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi', |
742 ], | 755 ], |
743 'msvs_cygwin_shell': 0, | 756 'msvs_cygwin_shell': 0, |
744 'action': [ | 757 'action': [ |
745 'python', 'tools/candle_and_light.py', | 758 'python', 'tools/candle_and_light.py', |
746 '--wix_path', '<(wix_path)', | 759 '--wix_path', '<(wix_path)', |
747 '--controller_clsid', '{<(daemon_controller_clsid)}', | 760 '--controller_clsid', '{<(daemon_controller_clsid)}', |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
798 '--intermediate_dir', '<(INTERMEDIATE_DIR).', | 811 '--intermediate_dir', '<(INTERMEDIATE_DIR).', |
799 '--output', '<@(_outputs)', | 812 '--output', '<@(_outputs)', |
800 ], | 813 ], |
801 'message': 'Unpacking and repacking to <@(_outputs)', | 814 'message': 'Unpacking and repacking to <@(_outputs)', |
802 }, | 815 }, |
803 ], | 816 ], |
804 }, # end of target 'remoting_host_installation_unittest' | 817 }, # end of target 'remoting_host_installation_unittest' |
805 ], # end of 'targets' | 818 ], # end of 'targets' |
806 }], # '<(wix_path) != ""' | 819 }], # '<(wix_path) != ""' |
807 | 820 |
| 821 ['remoting_multi_process != 0', { |
| 822 'targets': [ |
| 823 { |
| 824 'target_name': 'remoting_desktop', |
| 825 'type': 'executable', |
| 826 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 827 'dependencies': [ |
| 828 'remoting_base', |
| 829 'remoting_breakpad', |
| 830 'remoting_host', |
| 831 'remoting_version_resources', |
| 832 '../base/base.gyp:base', |
| 833 '../ipc/ipc.gyp:ipc', |
| 834 ], |
| 835 'sources': [ |
| 836 'host/branding.cc', |
| 837 'host/branding.h', |
| 838 'host/desktop_process.cc', |
| 839 'host/desktop_process.h', |
| 840 'host/host_ui.rc', |
| 841 'host/usage_stats_consent.h', |
| 842 'host/usage_stats_consent_win.cc', |
| 843 '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_desktop_version.rc', |
| 844 ], |
| 845 'link_settings': { |
| 846 'libraries': [ |
| 847 '-lcomctl32.lib', |
| 848 ], |
| 849 }, |
| 850 'msvs_settings': { |
| 851 'VCLinkerTool': { |
| 852 'AdditionalOptions': [ |
| 853 "\"/manifestdependency:type='win32' " |
| 854 "name='Microsoft.Windows.Common-Controls' " |
| 855 "version='6.0.0.0' " |
| 856 "processorArchitecture='*' " |
| 857 "publicKeyToken='6595b64144ccf1df' language='*'\"", |
| 858 ], |
| 859 'conditions': [ |
| 860 ['buildtype == "Official" and remoting_multi_process != 0', { |
| 861 'AdditionalOptions': [ |
| 862 "\"/MANIFESTUAC:level='requireAdministrator' " |
| 863 "uiAccess='true'\"", |
| 864 ], |
| 865 }], |
| 866 ], |
| 867 # 2 == /SUBSYSTEM:WINDOWS |
| 868 'SubSystem': '2', |
| 869 }, |
| 870 }, |
| 871 }, # end of target 'remoting_desktop' |
| 872 ], |
| 873 }], # 'remoting_multi_process != 0' |
| 874 |
808 ], # end of 'conditions' | 875 ], # end of 'conditions' |
809 | 876 |
810 'targets': [ | 877 'targets': [ |
811 { | 878 { |
812 'target_name': 'remoting_breakpad', | 879 'target_name': 'remoting_breakpad', |
813 'type': 'static_library', | 880 'type': 'static_library', |
814 'variables': { 'enable_wexit_time_destructors': 1, }, | 881 'variables': { 'enable_wexit_time_destructors': 1, }, |
815 'dependencies': [ | 882 'dependencies': [ |
816 '../base/base.gyp:base', | 883 '../base/base.gyp:base', |
817 ], | 884 ], |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
997 [ 'OS=="win"', { | 1064 [ 'OS=="win"', { |
998 'dependencies': [ | 1065 'dependencies': [ |
999 '../google_update/google_update.gyp:google_update', | 1066 '../google_update/google_update.gyp:google_update', |
1000 'remoting_elevated_controller', | 1067 'remoting_elevated_controller', |
1001 'remoting_version_resources', | 1068 'remoting_version_resources', |
1002 ], | 1069 ], |
1003 'include_dirs': [ | 1070 'include_dirs': [ |
1004 '<(INTERMEDIATE_DIR)', | 1071 '<(INTERMEDIATE_DIR)', |
1005 ], | 1072 ], |
1006 'sources': [ | 1073 'sources': [ |
1007 '<(SHARED_INTERMEDIATE_DIR)/remoting/host_plugin_version.rc', | 1074 '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_host_plugin_version.rc
', |
1008 'host/host_ui.rc', | 1075 'host/host_ui.rc', |
1009 'host/plugin/host_plugin.def', | 1076 'host/plugin/host_plugin.def', |
1010 ], | 1077 ], |
1011 }], | 1078 }], |
1012 ], | 1079 ], |
1013 }, # end of target 'remoting_host_plugin' | 1080 }, # end of target 'remoting_host_plugin' |
1014 | 1081 |
1015 { | 1082 { |
1016 'target_name': 'remoting_webapp', | 1083 'target_name': 'remoting_webapp', |
1017 'type': 'none', | 1084 'type': 'none', |
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1487 'mac_bundle_resources!': [ | 1554 'mac_bundle_resources!': [ |
1488 'host/remoting_me2me_host-Info.plist', | 1555 'host/remoting_me2me_host-Info.plist', |
1489 ], | 1556 ], |
1490 }], | 1557 }], |
1491 ['OS=="win"', { | 1558 ['OS=="win"', { |
1492 'dependencies': [ | 1559 'dependencies': [ |
1493 'remoting_version_resources', | 1560 'remoting_version_resources', |
1494 ], | 1561 ], |
1495 'sources': [ | 1562 'sources': [ |
1496 '<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc'
, | 1563 '<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc'
, |
1497 '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_me2me_host_version.rc'
, | 1564 '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_host_me2me_version.rc'
, |
1498 'host/host_ui.rc', | 1565 'host/host_ui.rc', |
1499 ], | 1566 ], |
1500 'link_settings': { | 1567 'link_settings': { |
1501 'libraries': [ | 1568 'libraries': [ |
1502 '-lcomctl32.lib', | 1569 '-lcomctl32.lib', |
1503 ], | 1570 ], |
1504 }, | 1571 }, |
1505 'msvs_settings': { | 1572 'msvs_settings': { |
1506 'VCLinkerTool': { | 1573 'VCLinkerTool': { |
1507 'AdditionalOptions': [ | 1574 'AdditionalOptions': [ |
1508 "\"/manifestdependency:type='win32' " | 1575 "\"/manifestdependency:type='win32' " |
1509 "name='Microsoft.Windows.Common-Controls' " | 1576 "name='Microsoft.Windows.Common-Controls' " |
1510 "version='6.0.0.0' " | 1577 "version='6.0.0.0' " |
1511 "processorArchitecture='*' " | 1578 "processorArchitecture='*' " |
1512 "publicKeyToken='6595b64144ccf1df' language='*'\"", | 1579 "publicKeyToken='6595b64144ccf1df' language='*'\"", |
1513 ], | 1580 ], |
1514 'conditions': [ | 1581 'conditions': [ |
1515 ['buildtype == "Official"', { | 1582 ['buildtype == "Official" and remoting_multi_process == 0', { |
1516 'AdditionalOptions': [ | 1583 'AdditionalOptions': [ |
1517 "\"/MANIFESTUAC:level='requireAdministrator' " | 1584 "\"/MANIFESTUAC:level='requireAdministrator' " |
1518 "uiAccess='true'\"", | 1585 "uiAccess='true'\"", |
1519 ], | 1586 ], |
1520 }], | 1587 }], |
1521 ], | 1588 ], |
1522 # 2 == /SUBSYSTEM:WINDOWS | 1589 # 2 == /SUBSYSTEM:WINDOWS |
1523 'SubSystem': '2', | 1590 'SubSystem': '2', |
1524 }, | 1591 }, |
1525 }, | 1592 }, |
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1851 '../base/allocator/allocator.gyp:allocator', | 1918 '../base/allocator/allocator.gyp:allocator', |
1852 ], | 1919 ], |
1853 }, | 1920 }, |
1854 ], | 1921 ], |
1855 ], | 1922 ], |
1856 }], | 1923 }], |
1857 ], # end of 'conditions' | 1924 ], # end of 'conditions' |
1858 }, # end of target 'remoting_unittests' | 1925 }, # end of target 'remoting_unittests' |
1859 ], # end of targets | 1926 ], # end of targets |
1860 } | 1927 } |
OLD | NEW |