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

Side by Side Diff: remoting/BUILD.gn

Issue 977943003: Fix remoting GN Mac build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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/BUILD.gn » ('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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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("//remoting/remoting_version.gni") 7 import("//remoting/remoting_version.gni")
8 import("//testing/test.gni") 8 import("//testing/test.gni")
9 9
10 enable_remoting_host = is_win || is_mac || is_chromeos || use_x11 10 enable_remoting_host = is_win || is_mac || is_chromeos || use_x11
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 "//remoting/resources", 52 "//remoting/resources",
53 "//testing/gmock", 53 "//testing/gmock",
54 "//testing/gtest", 54 "//testing/gtest",
55 ] 55 ]
56 56
57 if (enable_remoting_host) { 57 if (enable_remoting_host) {
58 deps += [ "//remoting/host:test_support" ] 58 deps += [ "//remoting/host:test_support" ]
59 } 59 }
60 } 60 }
61 61
62 # TODO(GYP) remoting_unittests on Windows. Currently this fails with a 62 # TODO(GYP) remoting_unittests on Mac/Windows. Currently this fails with a
63 # duplicate resource error on linking. 63 # duplicate resource error on linking on Windows. Just needs to be checked on
64 if (!is_win) { 64 # Mac.
65 if (!is_win && !is_mac) {
65 test("remoting_unittests") { 66 test("remoting_unittests") {
66 # Sources not included in one of the more specific unit_tests deps. 67 # Sources not included in one of the more specific unit_tests deps.
67 sources = [ 68 sources = [
68 "signaling/iq_sender_unittest.cc", 69 "signaling/iq_sender_unittest.cc",
69 "signaling/log_to_server_unittest.cc", 70 "signaling/log_to_server_unittest.cc",
70 "signaling/server_log_entry_unittest.cc", 71 "signaling/server_log_entry_unittest.cc",
71 "signaling/server_log_entry_unittest.h", 72 "signaling/server_log_entry_unittest.h",
72 "test/access_token_fetcher_unittest.cc", 73 "test/access_token_fetcher_unittest.cc",
73 "test/app_remoting_test_driver_environment_unittest.cc", 74 "test/app_remoting_test_driver_environment_unittest.cc",
74 ] 75 ]
(...skipping 30 matching lines...) Expand all
105 deps += [ 106 deps += [
106 "//third_party/libjingle:libjingle_webrtc", 107 "//third_party/libjingle:libjingle_webrtc",
107 "//third_party/libjingle:libpeerconnection", 108 "//third_party/libjingle:libpeerconnection",
108 ] 109 ]
109 } 110 }
110 } 111 }
111 } else { 112 } else {
112 group("remoting_unittests") { 113 group("remoting_unittests") {
113 } 114 }
114 } 115 }
OLDNEW
« no previous file with comments | « no previous file | remoting/host/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698