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

Side by Side Diff: remoting/remoting_host_win.gypi

Issue 2033683003: Removing Chromoting's dependence on the sas.dll (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updating comment Created 4 years, 6 months 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
« no previous file with comments | « remoting/host/win/rdp_client_window.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 'remoting_host_installer_win_roots': [ 7 'remoting_host_installer_win_roots': [
8 'host/installer/win/', 8 'host/installer/win/',
9 ], 9 ],
10 'remoting_host_installer_win_files': [ 10 'remoting_host_installer_win_files': [
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 'EmbedManifest': 'true', 251 'EmbedManifest': 'true',
252 'AdditionalManifestFiles': [ 252 'AdditionalManifestFiles': [
253 'host/win/common-controls.manifest', 253 'host/win/common-controls.manifest',
254 ], 254 ],
255 }, 255 },
256 'VCLinkerTool': { 256 'VCLinkerTool': {
257 'AdditionalDependencies': [ 257 'AdditionalDependencies': [
258 'comctl32.lib', 258 'comctl32.lib',
259 'rpcns4.lib', 259 'rpcns4.lib',
260 'rpcrt4.lib', 260 'rpcrt4.lib',
261 'sas.lib',
261 'uuid.lib', 262 'uuid.lib',
262 'wtsapi32.lib', 263 'wtsapi32.lib',
263 ], 264 ],
264 'AdditionalOptions': [ 265 'AdditionalOptions': [
265 # Export the proxy/stub entry points. Note that the generated 266 # Export the proxy/stub entry points. Note that the generated
266 # routines have 'Ps' prefix to avoid conflicts with our own 267 # routines have 'Ps' prefix to avoid conflicts with our own
267 # DllMain(). 268 # DllMain().
268 '/EXPORT:DllGetClassObject=PsDllGetClassObject,PRIVATE', 269 '/EXPORT:DllGetClassObject=PsDllGetClassObject,PRIVATE',
269 '/EXPORT:DllCanUnloadNow=PsDllCanUnloadNow,PRIVATE', 270 '/EXPORT:DllCanUnloadNow=PsDllCanUnloadNow,PRIVATE',
270 '/EXPORT:DllRegisterServer=PsDllRegisterServer,PRIVATE', 271 '/EXPORT:DllRegisterServer=PsDllRegisterServer,PRIVATE',
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 }, 529 },
529 ], 530 ],
530 }, # end of target 'remoting_windows_resources' 531 }, # end of target 'remoting_windows_resources'
531 ], # end of 'targets' 532 ], # end of 'targets'
532 533
533 'conditions': [ 534 'conditions': [
534 # The host installation is generated only if WiX is available. If 535 # The host installation is generated only if WiX is available. If
535 # component build is used the produced installation will not work due to 536 # component build is used the produced installation will not work due to
536 # missing DLLs. We build it anyway to make sure the GYP scripts are executed 537 # missing DLLs. We build it anyway to make sure the GYP scripts are executed
537 # by the bots. 538 # by the bots.
538 ['wix_exists == "True" and sas_dll_exists == "True"', { 539 ['wix_exists == "True"', {
539 'targets': [ 540 'targets': [
540 { 541 {
541 'target_name': 'remoting_host_installation', 542 'target_name': 'remoting_host_installation',
542 'type': 'none', 543 'type': 'none',
543 'dependencies': [ 544 'dependencies': [
544 'remoting_me2me_host_archive', 545 'remoting_me2me_host_archive',
545 ], 546 ],
546 'sources': [ 547 'sources': [
547 '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip', 548 '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip',
548 ], 549 ],
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 }], 617 }],
617 ], 618 ],
618 'defs': [ 619 'defs': [
619 'BRANDING=<(branding)', 620 'BRANDING=<(branding)',
620 'DAEMON_CONTROLLER_CLSID={<(daemon_controller_clsid)}', 621 'DAEMON_CONTROLLER_CLSID={<(daemon_controller_clsid)}',
621 'RDP_DESKTOP_SESSION_CLSID={<(rdp_desktop_session_clsid)}', 622 'RDP_DESKTOP_SESSION_CLSID={<(rdp_desktop_session_clsid)}',
622 'VERSION=<(version_full)', 623 'VERSION=<(version_full)',
623 ], 624 ],
624 'generated_files': [ 625 'generated_files': [
625 '<@(_compiled_inputs)', 626 '<@(_compiled_inputs)',
626 '<(sas_dll_path)/sas.dll',
627 '<(SHARED_INTERMEDIATE_DIR)/remoting/CREDITS.txt', 627 '<(SHARED_INTERMEDIATE_DIR)/remoting/CREDITS.txt',
628 '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json', 628 '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json',
629 '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json', 629 '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
630 'resources/chromoting.ico', 630 'resources/chromoting.ico',
631 '<(PRODUCT_DIR)/icudtl.dat', 631 '<(PRODUCT_DIR)/icudtl.dat',
632 ], 632 ],
633 'generated_files_dst': [ 633 'generated_files_dst': [
634 '<@(_compiled_inputs_dst)', 634 '<@(_compiled_inputs_dst)',
635 'files/sas.dll',
636 'files/CREDITS.txt', 635 'files/CREDITS.txt',
637 'files/com.google.chrome.remote_assistance.json', 636 'files/com.google.chrome.remote_assistance.json',
638 'files/com.google.chrome.remote_desktop.json', 637 'files/com.google.chrome.remote_desktop.json',
639 'files/chromoting.ico', 638 'files/chromoting.ico',
640 'files/icudtl.dat', 639 'files/icudtl.dat',
641 ], 640 ],
642 'zip_path': '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip', 641 'zip_path': '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip',
643 'outputs': [ 642 'outputs': [
644 '<(_zip_path)', 643 '<(_zip_path)',
645 ], 644 ],
646 'actions': [ 645 'actions': [
647 { 646 {
648 'action_name': 'Zip installer files for signing', 647 'action_name': 'Zip installer files for signing',
649 'temp_dir': '<(INTERMEDIATE_DIR)/installation', 648 'temp_dir': '<(INTERMEDIATE_DIR)/installation',
650 'source_files': [ 649 'source_files': [
651 '<@(remoting_host_installer_win_files)', 650 '<@(remoting_host_installer_win_files)',
652 ], 651 ],
653 'inputs': [ 652 'inputs': [
654 '<@(_compiled_inputs)', 653 '<@(_compiled_inputs)',
655 '<(sas_dll_path)/sas.dll',
656 '<@(_source_files)', 654 '<@(_source_files)',
657 'host/installer/build-installer-archive.py', 655 'host/installer/build-installer-archive.py',
658 'resources/chromoting.ico', 656 'resources/chromoting.ico',
659 ], 657 ],
660 'outputs': [ 658 'outputs': [
661 '<(_zip_path)', 659 '<(_zip_path)',
662 ], 660 ],
663 'action': [ 661 'action': [
664 'python', 'host/installer/build-installer-archive.py', 662 'python', 'host/installer/build-installer-archive.py',
665 '<(_temp_dir)', 663 '<(_temp_dir)',
(...skipping 14 matching lines...) Expand all
680 { 678 {
681 'target_name': 'remoting_host_installation', 679 'target_name': 'remoting_host_installation',
682 'type': 'none', 680 'type': 'none',
683 }, 681 },
684 682
685 { 683 {
686 'target_name': 'remoting_me2me_host_archive', 684 'target_name': 'remoting_me2me_host_archive',
687 'type': 'none', 685 'type': 'none',
688 }, 686 },
689 ], # end of 'targets' 687 ], # end of 'targets'
690 }], # 'wix_exists == "True" and sas_dll_exists == "True"' 688 }], # 'wix_exists == "True"
691 689
692 ], # end of 'conditions' 690 ], # end of 'conditions'
693 } 691 }
OLDNEW
« no previous file with comments | « remoting/host/win/rdp_client_window.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698