Skip to content

Commit

Permalink
Revert of Moving CRD Windows targets to subdirectories. (patchset chr…
Browse files Browse the repository at this point in the history
…omium#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}
  • Loading branch information
msw authored and Commit bot committed Sep 14, 2016
1 parent 3c1dea8 commit 8a1b5fe
Show file tree
Hide file tree
Showing 17 changed files with 627 additions and 842 deletions.
1 change: 0 additions & 1 deletion .gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
31 changes: 8 additions & 23 deletions remoting/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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",
]
}
}
}

Expand Down Expand Up @@ -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",
Expand All @@ -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",
]
}
}
}
17 changes: 0 additions & 17 deletions remoting/build/config/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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" ]
}
}
Loading

0 comments on commit 8a1b5fe

Please sign in to comment.