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

Side by Side Diff: remoting/host/BUILD.gn

Issue 2049173003: Updating remoting_start_host to use remoting_core.dll (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing CR feedback 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 | « no previous file | remoting/host/predefines_win.gni » ('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 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 import("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//build/config/win/manifest.gni") 7 import("//build/config/win/manifest.gni")
8 import("//build/util/version.gni") 8 import("//build/util/version.gni")
9 import("//remoting/remoting_enable.gni") 9 import("//remoting/remoting_enable.gni")
10 import("//remoting/remoting_locales.gni") 10 import("//remoting/remoting_locales.gni")
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 "$root_gen_dir/remoting/core.rc", 573 "$root_gen_dir/remoting/core.rc",
574 "$root_gen_dir/remoting/host/remoting_host_messages.rc", 574 "$root_gen_dir/remoting/host/remoting_host_messages.rc",
575 "$root_gen_dir/remoting/version.rc", 575 "$root_gen_dir/remoting/version.rc",
576 "desktop_process_main.cc", 576 "desktop_process_main.cc",
577 "host_main.cc", 577 "host_main.cc",
578 "host_main.h", 578 "host_main.h",
579 "it2me/it2me_native_messaging_host_main.cc", 579 "it2me/it2me_native_messaging_host_main.cc",
580 "it2me/it2me_native_messaging_host_main.h", 580 "it2me/it2me_native_messaging_host_main.h",
581 "security_key/remote_security_key_main.cc", 581 "security_key/remote_security_key_main.cc",
582 "security_key/remote_security_key_main.h", 582 "security_key/remote_security_key_main.h",
583 "setup/host_starter.cc",
584 "setup/host_starter.h",
583 "setup/me2me_native_messaging_host_main.cc", 585 "setup/me2me_native_messaging_host_main.cc",
584 "setup/me2me_native_messaging_host_main.h", 586 "setup/me2me_native_messaging_host_main.h",
587 "setup/start_host_main.cc",
588 "setup/start_host_main.h",
585 "win/chromoting_lib.rc", 589 "win/chromoting_lib.rc",
586 "win/chromoting_module.cc", 590 "win/chromoting_module.cc",
587 "win/chromoting_module.h", 591 "win/chromoting_module.h",
588 "win/core.cc", 592 "win/core.cc",
589 "win/core_resource.h", 593 "win/core_resource.h",
590 "win/host_service.cc", 594 "win/host_service.cc",
591 "win/host_service.h", 595 "win/host_service.h",
592 "win/omaha.cc", 596 "win/omaha.cc",
593 "win/omaha.h", 597 "win/omaha.h",
594 "win/rdp_desktop_session.cc", 598 "win/rdp_desktop_session.cc",
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 ldflags = [ 653 ldflags = [
650 "/ENTRY:HostEntryPoint", 654 "/ENTRY:HostEntryPoint",
651 # "/NODEFAULTLIB", 655 # "/NODEFAULTLIB",
652 ] 656 ]
653 } 657 }
654 658
655 # GYP version: //remoting/remoting_host_win.gypi:remote_security_key 659 # GYP version: //remoting/remoting_host_win.gypi:remote_security_key
656 executable("remote_security_key") { 660 executable("remote_security_key") {
657 configs += [ "//build/config/compiler:wexit_time_destructors" ] 661 configs += [ "//build/config/compiler:wexit_time_destructors" ]
658 662
659 defines = [ "BINARY=BINARY_REMOTE_SECURITY_KEY" ] 663 defines = host_predefines + [ "BINARY=BINARY_REMOTE_SECURITY_KEY" ]
660 664
661 deps = [ 665 deps = [
662 ":remoting_core", 666 ":remoting_core",
663 ":remoting_windows_resources", 667 ":remoting_windows_resources",
664 "//build/win:default_exe_manifest", 668 "//build/win:default_exe_manifest",
665 ] 669 ]
666 670
667 sources = [ 671 sources = [
668 "$root_gen_dir/remoting/version.rc", 672 "$root_gen_dir/remoting/version.rc",
669 "security_key/remote_security_key_entry_point.cc", 673 "security_key/remote_security_key_entry_point.cc",
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
716 720
717 locales = remoting_locales 721 locales = remoting_locales
718 } 722 }
719 723
720 # TODO(GYP) More Windows remoting targets from remoting_host_win.gypi 724 # TODO(GYP) More Windows remoting targets from remoting_host_win.gypi
721 } 725 }
722 726
723 if (enable_remoting_host && !is_android) { 727 if (enable_remoting_host && !is_android) {
724 executable("remoting_start_host") { 728 executable("remoting_start_host") {
725 sources = [ 729 sources = [
726 "setup/host_starter.cc", 730 "setup/start_host_entry_point.cc",
727 "setup/host_starter.h",
728 "setup/start_host.cc",
729 ] 731 ]
730 732
731 deps = [ 733 deps = [
732 "//build/config/sanitizers:deps", 734 "//build/config/sanitizers:deps",
733 "//build/win:default_exe_manifest",
734 "//remoting/host/setup",
735 ] 735 ]
736 736
737 configs += [ "//build/config/compiler:wexit_time_destructors" ]
738
739 if (is_win) {
740 defines = host_predefines + [ "BINARY=BINARY_REMOTING_START_HOST" ]
741
742 deps += [
743 ":remoting_core",
744 ":remoting_windows_resources",
745 "//build/win:default_exe_manifest",
746 ]
747 } else {
748 sources += [
749 "setup/host_starter.cc",
750 "setup/host_starter.h",
751 "setup/start_host_main.cc",
752 "setup/start_host_main.h",
753 ]
754
755 deps += [ "//remoting/host/setup" ]
756 }
757
737 if (enable_webrtc) { 758 if (enable_webrtc) {
738 deps += [ "//third_party/libjingle:libjingle_webrtc" ] 759 deps += [ "//third_party/libjingle:libjingle_webrtc" ]
739 } 760 }
740 } 761 }
741 762
742 action_foreach("remoting_native_messaging_manifests") { 763 action_foreach("remoting_native_messaging_manifests") {
743 if (is_mac) { 764 if (is_mac) {
744 assert(false, "not implemented on mac yet") 765 assert(false, "not implemented on mac yet")
745 } else if (is_win) { 766 } else if (is_win) {
746 me2me_host_path = "remoting_native_messaging_host.exe" 767 me2me_host_path = "remoting_native_messaging_host.exe"
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
1157 "--target_arch", 1178 "--target_arch",
1158 msi_script_arch, 1179 msi_script_arch,
1159 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip", 1180 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip",
1160 root_build_dir), 1181 root_build_dir),
1161 rebase_path(outputs[0], root_build_dir), 1182 rebase_path(outputs[0], root_build_dir),
1162 ] 1183 ]
1163 } 1184 }
1164 } 1185 }
1165 } 1186 }
1166 } 1187 }
OLDNEW
« no previous file with comments | « no previous file | remoting/host/predefines_win.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698