Skip to content

GitLab

T
tangled
Commit 8a1b5fea authored by msw's avatar msw Committed by Commit bot
Browse files
Options

Revert of Moving CRD Windows targets to subdirectories. (patchset #4 id:770001... 

Revert of Moving CRD Windows targets to subdirectories. (patchset #4 id:770001 of https://codereview.chromium.org/2308813002/ )

Reason for revert:
https://build.chromium.org/p/chromium/builders/Win/builds/47116/
FAILED: obj/remoting/host/win/remoting_core/chromoting_lib.res
C:/b/depot_tools/python276_bin/python.exe ...
../../remoting/host/win/chromoting_lib.rc(5) : error RC2135 : file not found: remoting/host/chromoting_lib.tlb

Original issue's description:
> Moving CRD Windows targets to subdirectories.
>
> This is the windows host focused GN rewrite for Remoting Host. This
> work attempts to simplify the build for Remoting so it can be more
> easily understood and maintained. This is done by pushing more of the target config checking deeper into the platform specific targets and
> producing build files that are more in-line with best-practice GN style.
>
> Committed: https://crrev.com/ac59f3fd88f185f04e1cd177fcc2d05a425308e6
> Cr-Commit-Position: refs/heads/master@{#418668}

TBR=zijiehe@chromium.org,joedow@chromium.org,brettw@chromium.org,nicholss@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.chromium.org/2339163004
Cr-Commit-Position: refs/heads/master@{#418686}
parent 3c1dea8b
Hide whitespace changes
Inline Side-by-side
Showing with 627 additions and 842 deletions
.gn
View file @ 8a1b5fea
......@@ -249,7 +249,6 @@ exec_script_whitelist = [
"//net/BUILD.gn",
"//remoting/host/BUILD.gn",
"//remoting/remoting_version.gni",
"//remoting/host/installer/win/generate_clsids.gni",
"//third_party/angle/BUILD.gn",
"//third_party/angle/src/tests/BUILD.gn",
"//third_party/angle/src/vulkan_support/BUILD.gn",
......
remoting/BUILD.gn
View file @ 8a1b5fea
......@@ -21,7 +21,8 @@ group("remoting_all") {
if (is_win) {
deps += [
"//remoting:remoting_breakpad_tester",
"//remoting/host/win:all",
"//remoting/host:remoting_console",
"//remoting/host:remoting_desktop",
]
if (is_chrome_branded) {
......@@ -54,8 +55,13 @@ group("remoting_all") {
}
}
if (is_win || (!is_chromeos && !is_android && !is_ios)) {
# The same target is called differently on Linux.
# TODO(sergeyu): Rename it to remoting_native_messaging_host on all
# platforms.
if (is_win) {
deps += [ "//remoting/host:remoting_native_messaging_host" ]
} else if (!is_chromeos && !is_android) {
deps += [ "//remoting/host:native_messaging_host" ]
}
if (is_linux && !is_chromeos) {
......@@ -84,20 +90,11 @@ if (is_win) {
"//remoting/host",
]
libs = []
configs += [ "//build/config/compiler:wexit_time_destructors" ]
sources = [
"tools/breakpad_tester_win.cc",
]
if (is_win) {
libs += [
"rpcrt4.lib",
"wtsapi32.lib",
]
}
}
}
......@@ -186,9 +183,6 @@ test("remoting_unittests") {
if (enable_remoting_host) {
test("remoting_perftests") {
defines = []
libs = []
sources = [
"test/codec_perftest.cc",
"test/protocol_perftest.cc",
......@@ -211,14 +205,5 @@ if (enable_remoting_host) {
if (enable_webrtc) {
deps += [ "//third_party/libjingle:libjingle_webrtc" ]
}
if (is_win) {
defines += [ "_ALT_NO_EXCEPTIONS" ]
libs += [
"rpcrt4.lib",
"wtsapi32.lib",
]
}
}
}
remoting/build/config/BUILD.gn
View file @ 8a1b5fea
......@@ -4,7 +4,6 @@
import("//build/config/features.gni")
import("//build/util/version.gni")
import("//remoting/remoting_options.gni")
# TODO(nicholss): Move this and other defines to version.h.in.
# Various remoting targets need this version definition.
......@@ -17,19 +16,3 @@ config("enable_webrtc_remoting_client") {
defines = [ "ENABLE_WEBRTC_REMOTING_CLIENT=1" ]
}
}
config("remoting_me2me_host") {
defines = []
if (is_mac && is_official_build) {
defines += [ "USE_REMOTING_MACOSX_INTERNAL" ]
}
if (is_win && remoting_multi_process != 0 && remoting_rdp_session != 0) {
defines += [ "REMOTING_RDP_SESSION" ]
}
if (remoting_multi_process != 0) {
defines += [ "REMOTING_MULTI_PROCESS" ]
}
}
remoting/host/BUILD.gn
View file @ 8a1b5fea
......@@ -4,44 +4,91 @@
import("//remoting/build/config/remoting_build.gni")
group("all_tests") {
testonly = true
deps = [
":unit_tests",
process_version("remoting_version") {
template_file = "//remoting/host/version.h.in"
sources = [
branding_path,
]
output = "$target_gen_dir/version.h"
}
group("all") {
testonly = true
if (is_win) {
import("//remoting/host/predefines_win.gni")
} else if (is_mac) {
import("//build/config/mac/rules.gni")
import("//third_party/icu/config.gni")
}
deps = [
":host",
]
if (enable_me2me_host) {
deps += [ "//remoting/host:remoting_me2me_host" ]
if (is_win) {
# Reference this manifest to indicate that a process is per-monitor DPI aware.
dpi_aware_manifest = "//remoting/host/win/dpi_aware.manifest"
# Reference this manifest to give the binary the uiAccess privilege.
enable_uiaccess_manifest = "//remoting/host/win/enable_uiaccess.manifest"
# Depending on this target gives the executable a default manifest with the
# addition of the DPI aware tag.
windows_manifest("dpi_aware_exe_manifest") {
sources = [
as_invoker_manifest,
common_controls_manifest,
default_compatibility_manifest,
dpi_aware_manifest,
]
type = "exe"
}
if (is_chrome_branded) {
deps += [ ":remoting_host_branded" ]
# Depending on this target gives the executable a default manifest with the
# addition of the DPI aware tag and requestedExecutionLevel of
# requireAdministrator.
windows_manifest("dpi_aware_elevated_exe_manifest") {
sources = [
common_controls_manifest,
default_compatibility_manifest,
dpi_aware_manifest,
require_administrator_manifest,
]
type = "exe"
}
if (!is_chromeos && !is_android && !is_ios) {
deps += [
"//remoting/host:remoting_native_messaging_host",
"//remoting/host:remoting_native_messaging_manifests",
"//remoting/host:remoting_start_host",
"//remoting/host/it2me:remote_assistance_host",
# Depending on this target gives the executable a default manifest with the
# addition of the DPI aware tag and enables uiAccess.
windows_manifest("dpi_aware_uiaccess_exe_manifest") {
sources = [
common_controls_manifest,
default_compatibility_manifest,
dpi_aware_manifest,
enable_uiaccess_manifest,
]
type = "exe"
}
}
process_version("remoting_version") {
template_file = "//remoting/host/version.h.in"
sources = [
branding_path,
action("credits") {
# We put this in $root_build_dir/gen/remoting instead of
# $root_build_dir/gen/remoting/host (target_gen_dir) for
# compatibility w/ GYP, since the installer needs the file to
# be at the same location.
about_credits_file = "$root_build_dir/gen/remoting/CREDITS.txt"
script = "//tools/licenses.py"
inputs = [
"installer/credits.tmpl",
"installer/credits_entry.tmpl",
]
outputs = [
about_credits_file,
]
args = [
"credits",
rebase_path(about_credits_file, root_build_dir),
"--file-template",
rebase_path("installer/credits.tmpl", root_build_dir),
"--entry-template",
rebase_path("installer/credits_entry.tmpl", root_build_dir),
]
output = "$target_gen_dir/version.h"
}
# This must be a static library instead of a source set because
......@@ -296,6 +343,32 @@ static_library("host") {
"usage_stats_consent_win.cc",
"username.cc",
"username.h",
"win/com_imported_mstscax.tlh",
"win/com_security.cc",
"win/com_security.h",
"win/elevation_helpers.cc",
"win/elevation_helpers.h",
"win/launch_process_with_token.cc",
"win/launch_process_with_token.h",
"win/omaha.cc",
"win/omaha.h",
"win/rdp_client.cc",
"win/rdp_client.h",
"win/rdp_client_window.cc",
"win/rdp_client_window.h",
"win/security_descriptor.cc",
"win/security_descriptor.h",
"win/session_desktop_environment.cc",
"win/session_desktop_environment.h",
"win/session_input_injector.cc",
"win/session_input_injector.h",
"win/window_station_and_desktop.cc",
"win/window_station_and_desktop.h",
"win/worker_process_launcher.cc",
"win/worker_process_launcher.h",
"win/wts_terminal_monitor.cc",
"win/wts_terminal_monitor.h",
"win/wts_terminal_observer.h",
]
libs = []
......@@ -324,8 +397,6 @@ static_library("host") {
"//ui/events/platform",
]
public_deps = []
if (enable_configuration_policy) {
deps += [ "//components/policy:generated" ]
}
......@@ -425,12 +496,9 @@ static_library("host") {
if (is_win) {
deps += [
"//remoting/host/win",
"//remoting/host/win:messages",
"//remoting/host/win:remoting_lib_idl",
":messages",
":remoting_lib_idl",
]
public_deps += [ "//remoting/host/win" ]
}
if (enable_webrtc) {
......@@ -539,6 +607,8 @@ source_set("unit_tests") {
"third_party_auth_config_unittest.cc",
"token_validator_factory_impl_unittest.cc",
"touch_injector_win_unittest.cc",
"win/rdp_client_unittest.cc",
"win/worker_process_launcher_unittest.cc",
]
if (!use_x11 && is_linux) {
......@@ -553,6 +623,14 @@ source_set("unit_tests") {
if (is_android) {
sources -= [ "it2me/it2me_native_messaging_host_unittest.cc" ]
}
if (is_win) {
sources += [
"win/elevated_native_messaging_host.cc",
"win/elevated_native_messaging_host.h",
"win/launch_native_messaging_host_process.cc",
"win/launch_native_messaging_host_process.h",
]
}
configs += [ "//remoting/build/config:version" ]
......@@ -569,33 +647,341 @@ source_set("unit_tests") {
"//testing/gmock",
"//testing/gtest",
]
if (is_win) {
deps += [ "//remoting/host/win:unit_tests" ]
}
if (enable_configuration_policy) {
deps += [ "//components/policy/core/browser:test_support" ]
}
}
group("remoting_host_branded") {
testonly = true
deps = []
if (enable_remoting_host) {
deps += [ ":remoting_host_installation" ]
if (is_win) {
import("//build/toolchain/win/midl.gni")
import("//build/win/message_compiler.gni")
# TODO(brettw) these should not be generated via exec_script. This should be
# part of the build process rather than the metabuild. Instead, a script
# should generate a header containing the #defines for this as well as the
# IDL file with the values.
clsids = exec_script("win/get_clsids.py",
[
daemon_controller_guid,
rdp_desktop_session_guid,
chrome_version_full,
],
"value")
daemon_controller_clsid = clsids[0]
rdp_desktop_session_clsid = clsids[1]
action("generate_idl") {
script = "//build/util/version.py"
inputs = [
"win/chromoting_lib_idl.templ",
]
outputs = [
"$target_gen_dir/chromoting_lib.idl",
]
args = [
"-e",
"DAEMON_CONTROLLER_CLSID='$daemon_controller_clsid'",
"-e",
"RDP_DESKTOP_SESSION_CLSID='$rdp_desktop_session_clsid'",
rebase_path(inputs[0], root_build_dir),
rebase_path(outputs[0], root_build_dir),
]
}
if (enable_me2me_host) {
deps += [ "//remoting/host:remoting_me2me_host_archive" ]
midl("remoting_lib_idl") {
sources = get_target_outputs(":generate_idl")
deps = [
":generate_idl",
]
}
}
if (enable_remoting_host) {
group("remoting_host_installation") {
deps = []
if (is_win) {
deps += [ "//remoting/host/installer/win:remoting_host_installation" ]
config("MIDL_config") {
if (is_clang) {
cflags = [
# MIDL generated code has a habit of omitting optional braces.
"-Wno-missing-braces",
# Source files generated by the MIDL compiler trigger warnings with
# -Wincompatible-pointer-types enabled.
"-Wno-incompatible-pointer-types",
# Generated code contains unused variables.
"-Wno-unused-variable",
# PROXYFILE_LIST_START is an extern with initializer.
"-Wno-extern-initializer",
]
}
}
static_library("remoting_lib_ps") {
configs += [ ":MIDL_config" ]
defines = [
"ENTRY_PREFIX=Ps",
"REGISTER_PROXY_DLL",
]
deps = [
":remoting_lib_idl",
]
sources = [
"$root_gen_dir/remoting/host/chromoting_lib.dlldata.c",
"$root_gen_dir/remoting/host/chromoting_lib_p.c",
]
}
# Makes the .mc file from the .mc.jinja file.
remoting_localize("messages_localizing") {
sources = [
"win/host_messages.mc.jinja2",
]
locales = remoting_locales
locale_dir = webapp_locale_dir
encoding = "utf-16"
# This target is funny. It only produces one file and the output doesn't
# match the input. We want to generate remoting_host_messages.mc from
# host_messages.mg.jinja2. GN complains if it doesn't see a pattern in the
# output, so the following pattern produces the name we want with a template
# based on the input.
#
# TODO: This is for GYP compat. We should just make the names match instead.
output = "$target_gen_dir/remoting_{{source_name_part}}"
}
# Makes the .h/.rc files from the .mc file.
message_compiler("messages") {
compile_generated_code = false
sources = get_target_outputs(":messages_localizing")
deps = [
":messages_localizing",
]
}
executable("remoting_console") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]
defines = host_predefines + [ "BINARY=BINARY_HOST_ME2ME" ]
deps = [
":dpi_aware_exe_manifest",
":remoting_core",
":remoting_windows_resources",
]
sources = [
"$root_gen_dir/remoting/version.rc",
"win/entry_point.cc",
]
ldflags = [
"/ENTRY:HostEntryPoint",
# "/NODEFAULTLIB",
]
}
shared_library("remoting_core") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]
defines = host_predefines + [
"_ATL_APARTMENT_THREADED",
"_ATL_CSTRING_EXPLICIT_CONSTRUCTORS",
"_ATL_NO_AUTOMATIC_NAMESPACE",
"_ATL_NO_EXCEPTIONS",
"BINARY=BINARY_CORE",
"DAEMON_CONTROLLER_CLSID=\"$daemon_controller_clsid\"",
"RDP_DESKTOP_SESSION_CLSID=\"$rdp_desktop_session_clsid\"",
"HOST_IMPLEMENTATION",
"ISOLATION_AWARE_ENABLED=1",
"STRICT",
"VERSION=$chrome_version_full",
]
if (remoting_multi_process != 0 && remoting_rdp_session != 0) {
defines += [ "REMOTING_RDP_SESSION" ]
}
if (remoting_multi_process != 0) {
defines += [ "REMOTING_MULTI_PROCESS" ]
}
deps = [
":host",
":messages",
":remoting_lib_idl",
":remoting_lib_ps",
":remoting_me2me_host_static",
":remoting_windows_resources",
"//base",
"//base:base_static",
"//base/allocator",
"//base/third_party/dynamic_annotations",
"//build/win:default_exe_manifest",
"//ipc",
"//net",
"//remoting/base",
"//remoting/base:breakpad",
"//remoting/codec",
"//remoting/host/it2me:common",
"//remoting/host/native_messaging",
"//remoting/host/security_key:main",
"//remoting/host/setup",
"//remoting/protocol",
"//sandbox/win:sandbox", # Should always use Windows version
"//third_party/webrtc/modules/desktop_capture",
]
sources = [
"$root_gen_dir/remoting/core.rc",
"$root_gen_dir/remoting/host/remoting_host_messages.rc",
"$root_gen_dir/remoting/version.rc",
"desktop_process_main.cc",
"host_main.cc",
"host_main.h",
"it2me/it2me_native_messaging_host_main.cc",
"it2me/it2me_native_messaging_host_main.h",
"setup/host_starter.cc",
"setup/host_starter.h",
"setup/me2me_native_messaging_host_main.cc",
"setup/me2me_native_messaging_host_main.h",
"setup/start_host_main.cc",
"setup/start_host_main.h",
"win/chromoting_lib.rc",
"win/chromoting_module.cc",
"win/chromoting_module.h",
"win/core.cc",
"win/core_resource.h",
"win/elevated_native_messaging_host.cc",
"win/elevated_native_messaging_host.h",
"win/host_service.cc",
"win/host_service.h",
"win/launch_native_messaging_host_process.cc",
"win/launch_native_messaging_host_process.h",
"win/omaha.cc",
"win/omaha.h",
"win/rdp_desktop_session.cc",
"win/rdp_desktop_session.h",
"win/unprivileged_process_delegate.cc",
"win/unprivileged_process_delegate.h",
"win/wts_session_process_delegate.cc",
"win/wts_session_process_delegate.h",
"worker_process_ipc_delegate.h",
]
ldflags = [
"/EXPORT:DllGetClassObject=PsDllGetClassObject,PRIVATE",
"/EXPORT:DllCanUnloadNow=PsDllCanUnloadNow,PRIVATE",
"/EXPORT:DllRegisterServer=PsDllRegisterServer,PRIVATE",
"/EXPORT:DllUnregisterServer=PsDllUnregisterServer,PRIVATE",
]
libs = [
"comctl32.lib",
"rpcns4.lib",
"rpcrt4.lib",
"sas.lib",
"uuid.lib",
"wtsapi32.lib",
]
if (is_clang) {
cflags = [ "-Wno-header-hygiene" ]
}
}
executable("remoting_desktop") {
configs += [
"//build/config/compiler:wexit_time_destructors",
"//build/config/win:windowed",
]
defines = host_predefines + [ "BINARY=BINARY_DESKTOP" ]
deps = [
":remoting_core",
":remoting_windows_resources",
]
if (is_official_build) {
deps += [ ":dpi_aware_elevated_exe_manifest" ]
} else {
deps += [ ":dpi_aware_exe_manifest" ]
}
sources = [
"$root_gen_dir/remoting/version.rc",
"win/entry_point.cc",
]
ldflags = [
"/ENTRY:HostEntryPoint",
# "/NODEFAULTLIB",
]
}
executable("remoting_native_messaging_host") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]
defines = host_predefines + [ "BINARY=BINARY_NATIVE_MESSAGING_HOST" ]
deps = [
":remoting_core",
":remoting_windows_resources",
"//build/win:default_exe_manifest",
]
if (is_mac) {
foreach(locale, remoting_locales_with_underscores) {
deps += [
":native_messaging_host_strings_${locale}_bundle_data",
":remoting_host_locale_${locale}_bundle_data",
]
}
deps += [
":remoting_infoplist_strings",
"//remoting/resources:copy_locales",
]
}
sources = [
"$root_gen_dir/remoting/version.rc",
"setup/me2me_native_messaging_host_entry_point.cc",
]
}
remoting_localize("remoting_windows_resources") {
deps = [
"//remoting/resources",
]
sources = [
"win/core.rc.jinja2",
"win/version.rc.jinja2",
]
# TODO(zijiehe): Export lastchange_path from
# //chrome/version.gni:process_version
variables = [
rebase_path(chrome_version_file),
rebase_path(remoting_version_file),
rebase_path("//build/util/LASTCHANGE"),
]
output = "$root_gen_dir/remoting/{{source_name_part}}"
locale_dir = webapp_locale_dir
encoding = "utf-16"
locales = remoting_locales
}
# TODO(GYP) More Windows remoting targets from remoting_host_win.gypi
}
if (enable_remoting_host && !is_android) {
......@@ -614,9 +1000,9 @@ if (enable_remoting_host && !is_android) {
defines = host_predefines + [ "BINARY=BINARY_REMOTING_START_HOST" ]
deps += [
":remoting_core",
":remoting_windows_resources",
"//build/win:default_exe_manifest",
"//remoting/host/win:remoting_core",
"//remoting/host/win:remoting_windows_resources",
]
} else {
sources += [
......@@ -742,10 +1128,7 @@ if (enable_me2me_host) {
]
defines = []
configs += [
"//remoting/build/config:version",
"//remoting/build/config:remoting_me2me_host",
]
configs += [ "//remoting/build/config:version" ]
deps = [
"//base",
......@@ -779,18 +1162,43 @@ if (enable_me2me_host) {
if (is_mac && is_official_build) {
sources += [ "internal/internal_mac-inl.h" ]
defines += [ "USE_REMOTING_MACOSX_INTERNAL" ]
}
if (is_win && remoting_multi_process != 0 && remoting_rdp_session != 0) {
defines += [ "REMOTING_RDP_SESSION" ]
}
if (remoting_multi_process != 0) {
defines += [ "REMOTING_MULTI_PROCESS" ]
}
}
if (is_win) {
group("remoting_me2me_host") {
deps = [
"//remoting/host/win:remoting_me2me_host",
executable("remoting_me2me_host") {
configs += [
"//build/config/compiler:wexit_time_destructors",
"//build/config/win:windowed",
]
}
group("remoting_native_messaging_host") {
defines = host_predefines + [ "BINARY=BINARY_HOST_ME2ME" ]
deps = [
"//remoting/host/win:remoting_native_messaging_host",
":dpi_aware_exe_manifest",
":remoting_core",
":remoting_windows_resources",
]
sources = [
"$root_gen_dir/remoting/version.rc",
"win/entry_point.cc",
]
output_name = "remoting_host"
ldflags = [
"/ENTRY:HostEntryPoint",
# "/NODEFAULTLIB",
]
}
} else {
......@@ -833,7 +1241,7 @@ if (enable_me2me_host) {
]
public_deps = [
"//remoting/host/installer:credits",
":credits",
]
if (icu_use_data_file) {
......@@ -867,10 +1275,10 @@ if (enable_me2me_host) {
}
deps = [
":credits",
":remoting_me2me_host_static",
"//build/config/sanitizers:deps",
"//remoting/base:breakpad",
"//remoting/host/installer:credits",
"//remoting/resources",
]
if (is_mac) {
......@@ -935,7 +1343,7 @@ if (enable_me2me_host) {
}
}
target(app_target_type, "remoting_native_messaging_host") {
target(app_target_type, "native_messaging_host") {
if (is_mac) {
info_plist = "setup/native_messaging_host-Info.plist"
extra_configs = [ "//build/config/compiler:wexit_time_destructors" ]
......@@ -1064,8 +1472,8 @@ if (enable_me2me_host) {
]
deps = [
":native_messaging_host",
":remoting_me2me_host",
":remoting_native_messaging_host",
":remoting_native_messaging_manifests",
":remoting_start_host",
"//remoting/host/it2me:remote_assistance_host",
......@@ -1074,10 +1482,107 @@ if (enable_me2me_host) {
]
}
} else if (is_win) {
group("remoting_me2me_host_archive") {
action("remoting_me2me_host_archive") {
script = "//remoting/host/installer/build-installer-archive.py"
deps = [
"//remoting/host/installer/win:remoting_me2me_host_archive",
":credits",
":remoting_core",
":remoting_desktop",
":remoting_me2me_host",
":remoting_native_messaging_host",
":remoting_native_messaging_manifests",
":remoting_start_host",
"it2me:remote_assistance_host",
"it2me:remote_assistance_host_uiaccess",
"//remoting/host/security_key:remote_security_key",
"//third_party/icu:icudata",
]
_output = "$root_out_dir/remoting-me2me-host-$target_os.zip"
outputs = [
_output,
]
if (is_chrome_branded) {
_branding = "Chrome"
} else {
_branding = "Chromium"
}
if (is_official_build) {
_official_build = "1"
} else {
_official_build = "0"
}
# Due to GN build issue http://crbug.com/633650, we need to actively set
# inputs parameter to tell GN to depend on these files. So change to each
# following files will trigger this target to be rebuilt.
# TODO(zijiehe): Remove inputs parameter once bug 633650 has been
# addressed.
inputs = [
"$root_out_dir/remote_assistance_host.exe",
"$root_out_dir/remote_assistance_host_uiaccess.exe",
"$root_out_dir/remote_security_key.exe",
"$root_out_dir/remoting_core.dll",
"$root_out_dir/remoting_desktop.exe",
"$root_out_dir/remoting_host.exe",
"$root_out_dir/remoting_native_messaging_host.exe",
"$root_out_dir/remoting_start_host.exe",
"$root_gen_dir/remoting/CREDITS.txt",
"$root_out_dir/remoting/com.google.chrome.remote_assistance.json",
"$root_out_dir/remoting/com.google.chrome.remote_desktop.json",
"$root_out_dir/icudtl.dat",
]
_generated_files = rebase_path(inputs, root_build_dir)
_generated_files += [ rebase_path("//remoting/resources/chromoting.ico") ]
# _generated_dst_files must contain the same files in the same order as
# _generated_files, otherwise the Windows MSI will not be built correctly.
_generated_dst_files = [
"files/remote_assistance_host.exe",
"files/remote_assistance_host_uiaccess.exe",
"files/remote_security_key.exe",
"files/remoting_core.dll",
"files/remoting_desktop.exe",
"files/remoting_host.exe",
"files/remoting_native_messaging_host.exe",
"files/remoting_start_host.exe",
"files/CREDITS.txt",
"files/com.google.chrome.remote_assistance.json",
"files/com.google.chrome.remote_desktop.json",
"files/icudtl.dat",
"files/chromoting.ico",
]
args =
[
rebase_path("$root_gen_dir/remoting_installation", root_build_dir),
rebase_path(_output, root_build_dir),
"--source-file-roots",
rebase_path("//remoting/host/installer/win"),
"--source-files",
rebase_path("//remoting/host/installer/win/chromoting.wxs"),
rebase_path("//remoting/host/installer/win/parameters.json"),
# Input files
"--generated-files",
] + _generated_files +
[
# Position of files in zip file
"--generated-files-dst",
] + _generated_dst_files +
[
# Defs
"--defs",
"BRANDING=$_branding",
"DAEMON_CONTROLLER_CLSID={$daemon_controller_clsid}",
"RDP_DESKTOP_SESSION_CLSID={$rdp_desktop_session_clsid}",
"VERSION=$chrome_version_full",
"OFFICIAL_BUILD=$_official_build",
]
}
} else if (is_mac) {
import("//build/config/zip.gni")
......@@ -1165,10 +1670,10 @@ if (enable_me2me_host) {
]
deps = [
":native_messaging_host",
":remoting_host_prefpane.prefPane",
":remoting_host_uninstaller",
":remoting_me2me_host",
":remoting_native_messaging_host",
":remoting_native_messaging_manifests",
"//remoting/host/it2me:remote_assistance_host",
]
......@@ -1369,4 +1874,37 @@ if (enable_me2me_host) {
group("remoting_me2me_host_archive") {
}
}
if (is_win && is_chrome_branded) {
# We do not release a 64 bits binary. So to avoid any potential
# misunderstanding, we only build 32 bits MSI file.
if (!is_component_build && target_cpu == "x86") {
# The script uses "ia32" instead of "x86".
msi_script_arch = "ia32"
action("remoting_host_installation") {
deps = [
"//remoting/host:remoting_me2me_host_archive",
]
script = "../tools/zip2msi.py"
outputs = [
"$root_out_dir/chromoting.msi",
]
args = [
"--wix_path",
rebase_path("//third_party/wix"),
"--intermediate_dir",
rebase_path("$root_gen_dir/remoting_installation", root_build_dir),
"--target_arch",
msi_script_arch,
rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip",
root_build_dir),
rebase_path(outputs[0], root_build_dir),
]
}
} else {
group("remoting_host_installation") {
}
}
}
}
remoting/host/desktop_session_win.cc
View file @ 8a1b5fea
......@@ -30,6 +30,8 @@
#include "ipc/ipc_message_macros.h"
#include "ipc/ipc_platform_file.h"
#include "remoting/base/auto_thread_task_runner.h"
// MIDL-generated declarations and definitions.
#include "remoting/host/chromoting_lib.h"
#include "remoting/host/chromoting_messages.h"
#include "remoting/host/daemon_process.h"
#include "remoting/host/desktop_session.h"
......@@ -37,8 +39,6 @@
#include "remoting/host/ipc_constants.h"
#include "remoting/host/sas_injector.h"
#include "remoting/host/screen_resolution.h"
// MIDL-generated declarations and definitions.
#include "remoting/host/win/chromoting_lib.h"
#include "remoting/host/win/host_service.h"
#include "remoting/host/win/worker_process_launcher.h"
#include "remoting/host/win/wts_session_process_delegate.h"
......
remoting/host/host_event_logger_win.cc
View file @ 8a1b5fea
......@@ -19,7 +19,7 @@
#include "net/base/ip_endpoint.h"
#include "remoting/host/host_status_monitor.h"
#include "remoting/host/host_status_observer.h"
#include "remoting/host/win/remoting_host_messages.h"
#include "remoting/host/remoting_host_messages.h"
#include "remoting/protocol/transport.h"
namespace remoting {
......
remoting/host/installer/BUILD.gn deleted 100644 → 0
View file @ 3c1dea8b
# Copyright 2016 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//remoting/build/config/remoting_build.gni")
action("credits") {
# We put this in $root_build_dir/gen/remoting instead of
# $root_build_dir/gen/remoting/host (target_gen_dir) for
# compatibility w/ GYP, since the installer needs the file to
# be at the same location.
about_credits_file = "$root_build_dir/gen/remoting/CREDITS.txt"
script = "//tools/licenses.py"
inputs = [
"credits.tmpl",
"credits_entry.tmpl",
]
outputs = [
about_credits_file,
]
args = [
"credits",
rebase_path(about_credits_file, root_build_dir),
"--file-template",
rebase_path("credits.tmpl", root_build_dir),
"--entry-template",
rebase_path("credits_entry.tmpl", root_build_dir),
]
}
remoting/host/installer/win/BUILD.gn deleted 100644 → 0
View file @ 3c1dea8b
# Copyright 2016 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//remoting/build/config/remoting_build.gni")
import("//remoting/host/installer/win/generate_clsids.gni")
import("//build/toolchain/win/midl.gni")
import("//build/win/message_compiler.gni")
action("remoting_me2me_host_archive") {
script = "//remoting/host/installer/build-installer-archive.py"
deps = [
"//remoting/host:remoting_native_messaging_manifests",
"//remoting/host:remoting_start_host",
"//remoting/host/installer:credits",
"//remoting/host/it2me:remote_assistance_host",
"//remoting/host/win:remoting_core",
"//remoting/host/win:remoting_desktop",
"//remoting/host/win:remoting_me2me_host",
"//remoting/host/win:remoting_native_messaging_host",
"//third_party/icu:icudata",
]
public_deps = [
"//remoting/host/security_key:remote_security_key",
]
_output = "$root_out_dir/remoting-me2me-host-$target_os.zip"
outputs = [
_output,
]
if (is_chrome_branded) {
_branding = "Chrome"
} else {
_branding = "Chromium"
}
if (is_official_build) {
_official_build = "1"
} else {
_official_build = "0"
}
# Due to GN build issue http://crbug.com/633650, we need to actively set
# inputs parameter to tell GN to depend on these files. So change to each
# following files will trigger this target to be rebuilt.
# TODO(zijiehe): Remove inputs parameter once bug 633650 has been
# addressed.
inputs = [
"$root_out_dir/remote_assistance_host.exe",
"$root_out_dir/remote_security_key.exe",
"$root_out_dir/remoting_core.dll",
"$root_out_dir/remoting_desktop.exe",
"$root_out_dir/remoting_host.exe",
"$root_out_dir/remoting_native_messaging_host.exe",
"$root_out_dir/remoting_start_host.exe",
"$root_gen_dir/remoting/CREDITS.txt",
"$root_out_dir/remoting/com.google.chrome.remote_assistance.json",
"$root_out_dir/remoting/com.google.chrome.remote_desktop.json",
"$root_out_dir/icudtl.dat",
]
_generated_files = rebase_path(inputs, root_build_dir)
_generated_files += [ rebase_path("//remoting/resources/chromoting.ico") ]
# _generated_dst_files must contain the same files in the same order as
# _generated_files, otherwise the Windows MSI will not be built correctly.
_generated_dst_files = [
"files/remote_assistance_host.exe",
"files/remote_security_key.exe",
"files/remoting_core.dll",
"files/remoting_desktop.exe",
"files/remoting_host.exe",
"files/remoting_native_messaging_host.exe",
"files/remoting_start_host.exe",
"files/CREDITS.txt",
"files/com.google.chrome.remote_assistance.json",
"files/com.google.chrome.remote_desktop.json",
"files/icudtl.dat",
"files/chromoting.ico",
]
args = [
rebase_path("$root_gen_dir/remoting_installation", root_build_dir),
rebase_path(_output, root_build_dir),
"--source-file-roots",
rebase_path("//remoting/host/installer/win"),
"--source-files",
rebase_path("//remoting/host/installer/win/chromoting.wxs"),
rebase_path("//remoting/host/installer/win/parameters.json"),
# Input files
"--generated-files",
] + _generated_files +
[
# Position of files in zip file
"--generated-files-dst",
] + _generated_dst_files +
[
# Defs
"--defs",
"BRANDING=$_branding",
"DAEMON_CONTROLLER_CLSID={$daemon_controller_clsid}",
"RDP_DESKTOP_SESSION_CLSID={$rdp_desktop_session_clsid}",
"VERSION=$chrome_version_full",
"OFFICIAL_BUILD=$_official_build",
]
}
if (is_chrome_branded) {
# We do not release a 64 bits binary. So to avoid any potential
# misunderstanding, we only build 32 bits MSI file.
if (!is_component_build && target_cpu == "x86") {
# The script uses "ia32" instead of "x86".
msi_script_arch = "ia32"
action("remoting_host_installation") {
deps = [
"//remoting/host:remoting_me2me_host_archive",
]
script = "//remoting/tools/zip2msi.py"
outputs = [
"$root_out_dir/chromoting.msi",
]
args = [
"--wix_path",
rebase_path("//third_party/wix"),
"--intermediate_dir",
rebase_path("$root_gen_dir/remoting_installation", root_build_dir),
"--target_arch",
msi_script_arch,
rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip",
root_build_dir),
rebase_path(outputs[0], root_build_dir),
]
}
}
} else {
group("remoting_host_installation") {
}
}
remoting/host/installer/win/generate_clsids.gni deleted 100644 → 0
View file @ 3c1dea8b
# Copyright 2016 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//remoting/build/config/remoting_build.gni")
# TODO(brettw) these should not be generated via exec_script. This should be
# part of the build process rather than the metabuild. Instead, a script
# should generate a header containing the #defines for this as well as the
# IDL file with the values.
clsids = exec_script("//remoting/host/win/get_clsids.py",
[
daemon_controller_guid,
rdp_desktop_session_guid,
chrome_version_full,
],
"value")
daemon_controller_clsid = clsids[0]
rdp_desktop_session_clsid = clsids[1]
remoting/host/it2me/BUILD.gn
View file @ 8a1b5fea
......@@ -79,9 +79,9 @@ if (!is_chromeos && !is_android && enable_remoting_host) {
deps = [
"//base/allocator",
"//remoting/host/win:dpi_aware_exe_manifest",
"//remoting/host/win:remoting_core",
"//remoting/host/win:remoting_windows_resources",
"//remoting/host:dpi_aware_exe_manifest",
"//remoting/host:remoting_core",
"//remoting/host:remoting_windows_resources",
]
sources = [
......@@ -105,8 +105,8 @@ if (!is_chromeos && !is_android && enable_remoting_host) {
deps = [
"//base/allocator",
"//remoting/host/win:remoting_core",
"//remoting/host/win:remoting_windows_resources",
"//remoting/host:remoting_core",
"//remoting/host:remoting_windows_resources",
]
sources = [
......@@ -127,7 +127,7 @@ if (!is_chromeos && !is_android && enable_remoting_host) {
if (is_official_build) {
deps += [ "//remoting/host:dpi_aware_uiaccess_exe_manifest" ]
} else {
deps += [ "//remoting/host/win:dpi_aware_exe_manifest" ]
deps += [ "//remoting/host:dpi_aware_exe_manifest" ]
}
}
} else {
......
remoting/host/security_key/BUILD.gn
View file @ 8a1b5fea
......@@ -62,8 +62,8 @@ if (is_win) {
deps = [
"//build/win:default_exe_manifest",
"//remoting/host/win:remoting_core",
"//remoting/host/win:remoting_windows_resources",
"//remoting/host:remoting_core",
"//remoting/host:remoting_windows_resources",
]
sources = [
......
remoting/host/setup/BUILD.gn
View file @ 8a1b5fea
......@@ -44,6 +44,6 @@ source_set("setup") {
]
if (is_win) {
deps += [ "//remoting/host/win:remoting_lib_idl" ]
deps += [ "//remoting/host:remoting_lib_idl" ]
}
}
remoting/host/win/BUILD.gn deleted 100644 → 0
View file @ 3c1dea8b
# Copyright 2016 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//remoting/build/config/remoting_build.gni")
import("//remoting/host/installer/win/generate_clsids.gni")
import("//build/toolchain/win/midl.gni")
import("//build/win/message_compiler.gni")
group("all") {
testonly = true
deps = [
":remoting_console",
":remoting_desktop",
":remoting_me2me_host",
":remoting_native_messaging_host",
"//remoting/host/security_key:remote_security_key",
]
}
# Reference this manifest to indicate that a process is per-monitor DPI aware.
dpi_aware_manifest = "//remoting/host/win/dpi_aware.manifest"
# Reference this manifest to give the binary the uiAccess privilege.
enable_uiaccess_manifest = "//remoting/host/win/enable_uiaccess.manifest"
# Depending on this target gives a default executable manifest with the addition
# of the DPI aware tag.
windows_manifest("dpi_aware_exe_manifest") {
sources = [
as_invoker_manifest,
common_controls_manifest,
default_compatibility_manifest,
dpi_aware_manifest,
]
type = "exe"
}
# Depending on this target gives a default executable manifest with the addition
# of the DPI aware tag and a requestedExecutionLevel of requireAdministrator.
windows_manifest("dpi_aware_elevated_exe_manifest") {
sources = [
common_controls_manifest,
default_compatibility_manifest,
dpi_aware_manifest,
require_administrator_manifest,
]
type = "exe"
}
# Depending on this target gives the executable a default manifest with the
# addition of the DPI aware tag and enables uiAccess.
windows_manifest("dpi_aware_uiaccess_exe_manifest") {
sources = [
common_controls_manifest,
default_compatibility_manifest,
dpi_aware_manifest,
enable_uiaccess_manifest,
]
type = "exe"
}
source_set("win") {
sources = [
"com_imported_mstscax.tlh",
"com_security.cc",
"com_security.h",
"elevation_helpers.cc",
"elevation_helpers.h",
"launch_process_with_token.cc",
"launch_process_with_token.h",
"omaha.cc",
"omaha.h",
"rdp_client.cc",
"rdp_client.h",
"rdp_client_window.cc",
"rdp_client_window.h",
"security_descriptor.cc",
"security_descriptor.h",
"session_desktop_environment.cc",
"session_desktop_environment.h",
"session_input_injector.cc",
"session_input_injector.h",
"window_station_and_desktop.cc",
"window_station_and_desktop.h",
"worker_process_launcher.cc",
"worker_process_launcher.h",
"wts_terminal_monitor.cc",
"wts_terminal_monitor.h",
"wts_terminal_observer.h",
]
configs += [
"//build/config/compiler:wexit_time_destructors",
"//remoting/build/config:version",
]
defines = [ "WEBRTC_CHROMIUM_BUILD" ]
deps = [
"//base:i18n",
"//components/policy/core/common",
"//content/public/common",
"//crypto",
"//device/power_save_blocker",
"//google_apis",
"//ipc",
"//remoting/base",
"//remoting/host/security_key",
"//remoting/host/win:messages",
"//remoting/host/win:remoting_lib_idl",
"//remoting/protocol",
"//remoting/resources",
"//ui/base",
"//ui/events:dom_keycode_converter",
"//ui/events/platform",
]
if (enable_configuration_policy) {
deps += [ "//components/policy:generated" ]
}
if (enable_webrtc) {
deps += [ "//third_party/webrtc/modules/desktop_capture" ]
}
}
source_set("unit_tests") {
testonly = true
sources = [
"elevated_native_messaging_host.cc",
"elevated_native_messaging_host.h",
"launch_native_messaging_host_process.cc",
"launch_native_messaging_host_process.h",
"rdp_client_unittest.cc",
"worker_process_launcher_unittest.cc",
]
deps = [
"//remoting/host",
"//remoting/host:test_support",
"//remoting/host/it2me:common",
"//remoting/host/native_messaging",
"//remoting/host/security_key:unit_tests",
"//remoting/host/setup",
"//remoting/proto",
"//remoting/resources",
"//skia",
"//testing/gmock",
"//testing/gtest",
]
}
action("generate_idl") {
script = "//build/util/version.py"
inputs = [
"chromoting_lib_idl.templ",
]
outputs = [
"$target_gen_dir/chromoting_lib.idl",
]
args = [
"-e",
"DAEMON_CONTROLLER_CLSID='$daemon_controller_clsid'",
"-e",
"RDP_DESKTOP_SESSION_CLSID='$rdp_desktop_session_clsid'",
rebase_path(inputs[0], root_build_dir),
rebase_path(outputs[0], root_build_dir),
]
}
midl("remoting_lib_idl") {
sources = get_target_outputs(":generate_idl")
deps = [
":generate_idl",
]
}
config("MIDL_config") {
if (is_clang) {
cflags = [
# MIDL generated code has a habit of omitting optional braces.
"-Wno-missing-braces",
# Source files generated by the MIDL compiler trigger warnings with
# -Wincompatible-pointer-types enabled.
"-Wno-incompatible-pointer-types",
# Generated code contains unused variables.
"-Wno-unused-variable",
# PROXYFILE_LIST_START is an extern with initializer.
"-Wno-extern-initializer",
]
}
}
static_library("remoting_lib_ps") {
configs += [ ":MIDL_config" ]
defines = [
"ENTRY_PREFIX=Ps",
"REGISTER_PROXY_DLL",
]
deps = [
":remoting_lib_idl",
]
sources = [
"$root_gen_dir/remoting/host/win/chromoting_lib.dlldata.c",
"$root_gen_dir/remoting/host/win/chromoting_lib_p.c",
]
}
# Makes the .mc file from the .mc.jinja file.
remoting_localize("messages_localizing") {
sources = [
"host_messages.mc.jinja2",
]
locales = remoting_locales
locale_dir = webapp_locale_dir
encoding = "utf-16"
# This target is funny. It only produces one file and the output doesn't
# match the input. We want to generate remoting_host_messages.mc from
# host_messages.mg.jinja2. GN complains if it doesn't see a pattern in the
# output, so the following pattern produces the name we want with a template
# based on the input.
#
# TODO: This is for GYP compat. We should just make the names match instead.
output = "$target_gen_dir/remoting_{{source_name_part}}"
}
# Makes the .h/.rc files from the .mc file.
message_compiler("messages") {
compile_generated_code = false
sources = get_target_outputs(":messages_localizing")
deps = [
":messages_localizing",
]
}
executable("remoting_console") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]
defines = host_predefines + [ "BINARY=BINARY_HOST_ME2ME" ]
deps = [
":dpi_aware_exe_manifest",
":remoting_core",
":remoting_windows_resources",
]
sources = [
"$root_gen_dir/remoting/version.rc",
"entry_point.cc",
]
ldflags = [
"/ENTRY:HostEntryPoint",
# "/NODEFAULTLIB",
]
}
executable("remoting_me2me_host") {
configs += [
"//build/config/compiler:wexit_time_destructors",
"//build/config/win:windowed",
"//remoting/build/config:remoting_me2me_host",
]
defines = host_predefines + [ "BINARY=BINARY_HOST_ME2ME" ]
deps = [
":dpi_aware_exe_manifest",
":remoting_core",
":remoting_windows_resources",
]
sources = [
"$root_gen_dir/remoting/version.rc",
"entry_point.cc",
]
output_name = "remoting_host"
ldflags = [ "/ENTRY:HostEntryPoint" ]
}
shared_library("remoting_core") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]
defines = host_predefines + [
"_ATL_APARTMENT_THREADED",
"_ATL_CSTRING_EXPLICIT_CONSTRUCTORS",
"_ATL_NO_AUTOMATIC_NAMESPACE",
"_ATL_NO_EXCEPTIONS",
"BINARY=BINARY_CORE",
"DAEMON_CONTROLLER_CLSID=\"$daemon_controller_clsid\"",
"RDP_DESKTOP_SESSION_CLSID=\"$rdp_desktop_session_clsid\"",
"HOST_IMPLEMENTATION",
"ISOLATION_AWARE_ENABLED=1",
"STRICT",
"VERSION=$chrome_version_full",
]
if (remoting_multi_process != 0 && remoting_rdp_session != 0) {
defines += [ "REMOTING_RDP_SESSION" ]
}
if (remoting_multi_process != 0) {
defines += [ "REMOTING_MULTI_PROCESS" ]
}
sources = [
"$root_gen_dir/remoting/core.rc",
"$root_gen_dir/remoting/host/win/remoting_host_messages.rc",
"$root_gen_dir/remoting/version.rc",
"//remoting/host/desktop_process_main.cc",
"//remoting/host/host_main.cc",
"//remoting/host/host_main.h",
"//remoting/host/it2me/it2me_native_messaging_host_main.cc",
"//remoting/host/it2me/it2me_native_messaging_host_main.h",
"//remoting/host/setup/host_starter.cc",
"//remoting/host/setup/host_starter.h",
"//remoting/host/setup/me2me_native_messaging_host_main.cc",
"//remoting/host/setup/me2me_native_messaging_host_main.h",
"//remoting/host/setup/start_host_main.cc",
"//remoting/host/setup/start_host_main.h",
"//remoting/host/worker_process_ipc_delegate.h",
"chromoting_lib.rc",
"chromoting_module.cc",
"chromoting_module.h",
"core.cc",
"core_resource.h",
"elevated_native_messaging_host.cc",
"elevated_native_messaging_host.h",
"host_service.cc",
"host_service.h",
"launch_native_messaging_host_process.cc",
"launch_native_messaging_host_process.h",
"rdp_desktop_session.cc",
"rdp_desktop_session.h",
"unprivileged_process_delegate.cc",
"unprivileged_process_delegate.h",
"wts_session_process_delegate.cc",
"wts_session_process_delegate.h",
]
deps = [
":messages",
":remoting_lib_idl",
":remoting_lib_ps",
":remoting_windows_resources",
":win",
"//base",
"//base:base_static",
"//base/allocator",
"//base/third_party/dynamic_annotations",
"//build/win:default_exe_manifest",
"//ipc",
"//net",
"//remoting/base",
"//remoting/base:breakpad",
"//remoting/codec",
"//remoting/host:host",
"//remoting/host:remoting_me2me_host_static",
"//remoting/host/it2me:common",
"//remoting/host/native_messaging",
"//remoting/host/security_key:main",
"//remoting/host/setup",
"//remoting/protocol",
"//sandbox/win:sandbox", # Should always use Windows version
"//third_party/webrtc/modules/desktop_capture",
]
ldflags = [
"/EXPORT:DllGetClassObject=PsDllGetClassObject,PRIVATE",
"/EXPORT:DllCanUnloadNow=PsDllCanUnloadNow,PRIVATE",
"/EXPORT:DllRegisterServer=PsDllRegisterServer,PRIVATE",
"/EXPORT:DllUnregisterServer=PsDllUnregisterServer,PRIVATE",
]
libs = [
"comctl32.lib",
"rpcns4.lib",
"rpcrt4.lib",
"sas.lib",
"uuid.lib",
"wtsapi32.lib",
]
if (is_clang) {
cflags = [ "-Wno-header-hygiene" ]
}
}
executable("remoting_desktop") {
configs += [
"//build/config/compiler:wexit_time_destructors",
"//build/config/win:windowed",
]
defines = host_predefines + [ "BINARY=BINARY_DESKTOP" ]
deps = [
":remoting_core",
":remoting_windows_resources",
]
if (is_official_build) {
deps += [ ":dpi_aware_elevated_exe_manifest" ]
} else {
deps += [ ":dpi_aware_exe_manifest" ]
}
sources = [
"$root_gen_dir/remoting/version.rc",
"entry_point.cc",
]
ldflags = [
"/ENTRY:HostEntryPoint",
# "/NODEFAULTLIB",
]
}
executable("remoting_native_messaging_host") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]
defines = host_predefines + [ "BINARY=BINARY_NATIVE_MESSAGING_HOST" ]
deps = [
":remoting_core",
":remoting_windows_resources",
"//build/win:default_exe_manifest",
]
sources = [
"$root_gen_dir/remoting/version.rc",
"../setup/me2me_native_messaging_host_entry_point.cc",
]
}
remoting_localize("remoting_windows_resources") {
deps = [
"//remoting/resources",
]
sources = [
"core.rc.jinja2",
"version.rc.jinja2",
]
# TODO(zijiehe): Export lastchange_path from
# //chrome/version.gni:process_version
variables = [
rebase_path(chrome_version_file),
rebase_path(remoting_version_file),
rebase_path("//build/util/LASTCHANGE"),
]
output = "$root_gen_dir/remoting/{{source_name_part}}"
locale_dir = webapp_locale_dir
encoding = "utf-16"
locales = remoting_locales
}
# TODO(GYP) More Windows remoting targets from remoting_host_win.gypi
remoting/host/win/chromoting_module.h
View file @ 8a1b5fea
......@@ -14,7 +14,7 @@
#include "base/win/scoped_com_initializer.h"
// chromoting_lib.h contains MIDL-generated declarations.
#include "remoting/host/win/chromoting_lib.h"
#include "remoting/host/chromoting_lib.h"
namespace base {
namespace win {
......
remoting/host/win/rdp_desktop_session.h
View file @ 8a1b5fea
......@@ -13,7 +13,7 @@
#include "base/win/scoped_comptr.h"
// chromoting_lib.h contains MIDL-generated declarations.
#include "remoting/host/win/chromoting_lib.h"
#include "remoting/host/chromoting_lib.h"
#include "remoting/host/win/rdp_client.h"
namespace remoting {
......
remoting/test/BUILD.gn
View file @ 8a1b5fea
......@@ -185,8 +185,6 @@ if (enable_remoting_host && !is_android && !is_chromeos) {
executable("it2me_standalone_host_main") {
testonly = true
defines = []
libs = []
sources = [
"it2me_standalone_host_main.cc",
......@@ -200,15 +198,6 @@ if (enable_remoting_host && !is_android && !is_chromeos) {
if (is_desktop_linux) {
deps += [ "//build/config/linux/gtk2" ]
}
if (is_win) {
defines += [ "_ALT_NO_EXCEPTIONS" ]
libs += [
"rpcrt4.lib",
"wtsapi32.lib",
]
}
}
}
......
remoting/tools/BUILD.gn deleted 100644 → 0
View file @ 3c1dea8b
# Copyright 2016 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//remoting/build/config/remoting_build.gni")
group("all_tests") {
testonly = true
}
group("all") {
testonly = true
deps = []
if (is_win) {
deps += [ ":remoting_breakpad_tester" ]
}
if (enable_nacl) {
deps += [ "//remoting/tools/javascript_key_tester" ]
}
}
if (is_win) {
executable("remoting_breakpad_tester") {
deps = [
"//base",
"//build/win:default_exe_manifest",
"//remoting/host",
]
configs += [ "//build/config/compiler:wexit_time_destructors" ]
sources = [
"breakpad_tester_win.cc",
]
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment