Commit bc422601 authored by Brett Wilson's avatar Brett Wilson

Fix remoting GN Mac build.

TBR=dpranke

Review URL: https://codereview.chromium.org/977943003

Cr-Commit-Position: refs/heads/master@{#319090}
parent 4596b516
......@@ -59,9 +59,10 @@ source_set("test_support") {
}
}
# TODO(GYP) remoting_unittests on Windows. Currently this fails with a
# duplicate resource error on linking.
if (!is_win) {
# TODO(GYP) remoting_unittests on Mac/Windows. Currently this fails with a
# duplicate resource error on linking on Windows. Just needs to be checked on
# Mac.
if (!is_win && !is_mac) {
test("remoting_unittests") {
# Sources not included in one of the more specific unit_tests deps.
sources = [
......
......@@ -9,14 +9,22 @@ import("//remoting/remoting_srcs.gni")
import("//remoting/remoting_version.gni")
import("//remoting/tools/build/remoting_localize.gni")
# This must be a static library instead of a source set because
# remoting_unittests requires that remoting_me2me_host.cc not be pulled in,
# which in turn depends on remoting_me2me_host_static which isn't part of that
# build.
#
# TODO fix this, successful builds should not depend on static libraries
# stripping code.
static_library("host") {
if (is_mac) { # TODO(GYP) Mac build of remoting host.
group("host") {
}
group("test_support") {
}
group("unit_tests") {
}
} else {
# This must be a static library instead of a source set because
# remoting_unittests requires that remoting_me2me_host.cc not be pulled in,
# which in turn depends on remoting_me2me_host_static which isn't part of that
# build.
#
# TODO fix this, successful builds should not depend on static libraries
# stripping code.
static_library("host") {
sources = rebase_path(remoting_host_srcs_gypi_values.remoting_host_sources,
".",
"//remoting")
......@@ -123,7 +131,7 @@ static_library("host") {
"libpam.a",
]
deps += [ "//google_toolbox_for_mac" ]
deps += [ "//third_party/google_toolbox_for_mac" ]
}
if (is_win) {
......@@ -139,13 +147,14 @@ static_library("host") {
"//third_party/webrtc/modules/desktop_capture",
]
sources += rebase_path(remoting_host_srcs_gypi_values.remoting_cast_sources,
sources +=
rebase_path(remoting_host_srcs_gypi_values.remoting_cast_sources,
".",
"//remoting")
}
}
}
source_set("test_support") {
source_set("test_support") {
testonly = true
sources = [
......@@ -175,10 +184,10 @@ source_set("test_support") {
"//third_party/webrtc/modules/desktop_capture",
]
}
}
}
# The host portions of the remoting unit tests.
source_set("unit_tests") {
# The host portions of the remoting unit tests.
source_set("unit_tests") {
testonly = true
sources = [
......@@ -252,9 +261,9 @@ source_set("unit_tests") {
"//testing/gmock",
"//testing/gtest",
]
}
}
if (is_win) {
if (is_win) {
import("//build/toolchain/win/midl.gni")
import("//remoting/tools/build/message_compiler.gni")
......@@ -327,4 +336,5 @@ if (is_win) {
}
# TODO(GYP) More Windows remoting targets from remoting_host_win.gypi
}
}
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