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

Unified Diff: remoting/client/BUILD.gn

Issue 1312463005: Compile remoting client plugin with GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/base/BUILD.gn ('k') | remoting/client/plugin/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/BUILD.gn
diff --git a/remoting/client/BUILD.gn b/remoting/client/BUILD.gn
index e26fdbd68996de3d77cb073d3474630dd8753301..a3cc1b10a94b4f194e872c6c9b89d065effae5a7 100644
--- a/remoting/client/BUILD.gn
+++ b/remoting/client/BUILD.gn
@@ -5,9 +5,13 @@
import("//remoting/remoting_srcs.gni")
source_set("client") {
+ # Disabled the source filters because there are _mac files that need to
+ # be compiled on all platforms.
+ set_sources_assignment_filter([])
sources = rebase_path(remoting_srcs_gypi_values.remoting_client_sources,
".",
"//remoting")
+ set_sources_assignment_filter(sources_assignment_filter)
configs += [
"//build/config/compiler:wexit_time_destructors",
@@ -19,13 +23,23 @@ source_set("client") {
"//remoting/codec",
"//remoting/protocol",
"//third_party/libyuv",
- "//third_party/webrtc/modules/desktop_capture",
+ "//third_party/webrtc/modules/desktop_capture:primitives",
]
+
+ if (is_nacl) {
+ sources -= [
+ "client_status_logger.cc",
+ "server_log_entry_client.cc",
+ ]
+ }
}
source_set("unit_tests") {
testonly = true
+ # Disabled the source filters because there are _mac files that need to
+ # be compiled on all platforms.
+ set_sources_assignment_filter([])
sources = [
"audio_player_unittest.cc",
"client_status_logger_unittest.cc",
@@ -37,6 +51,7 @@ source_set("unit_tests") {
"software_video_renderer_unittest.cc",
"touch_input_scaler_unittest.cc",
]
+ set_sources_assignment_filter(sources_assignment_filter)
configs += [ "//remoting:version" ]
« no previous file with comments | « remoting/base/BUILD.gn ('k') | remoting/client/plugin/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698