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

Side by Side Diff: remoting/protocol/BUILD.gn

Issue 1834163002: Revert of Remove libpeerconnection target from third_party/libjingle (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « remoting/host/BUILD.gn ('k') | remoting/remoting.gyp » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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("//remoting/remoting_srcs.gni") 6 import("//remoting/remoting_srcs.gni")
7 7
8 source_set("protocol") { 8 source_set("protocol") {
9 sources = rebase_path(remoting_srcs_gypi_values.remoting_protocol_sources, 9 sources = rebase_path(remoting_srcs_gypi_values.remoting_protocol_sources,
10 ".", 10 ".",
(...skipping 21 matching lines...) Expand all
32 "//third_party/libyuv", 32 "//third_party/libyuv",
33 ] 33 ]
34 34
35 if (!is_nacl) { 35 if (!is_nacl) {
36 sources += 36 sources +=
37 rebase_path(remoting_srcs_gypi_values.remoting_protocol_nonnacl_sources, 37 rebase_path(remoting_srcs_gypi_values.remoting_protocol_nonnacl_sources,
38 ".", 38 ".",
39 "//remoting") 39 "//remoting")
40 40
41 if (enable_webrtc) { 41 if (enable_webrtc) {
42 deps += [ "//third_party/libjingle:libjingle_webrtc" ] 42 deps += [
43 # TODO(GYP): crbug.com/481633. We should probably not have to depend on
44 # libjingle_webrtc; that should be pulled in automatically by
45 # libpeerconnection instead.
46 "//third_party/libjingle:libjingle_webrtc",
47 "//third_party/libjingle:libpeerconnection",
48 ]
43 } else { 49 } else {
44 sources -= [ 50 sources -= [
45 "webrtc_connection_to_client.cc", 51 "webrtc_connection_to_client.cc",
46 "webrtc_transport.cc", 52 "webrtc_transport.cc",
47 "webrtc_video_capturer_adapter.cc", 53 "webrtc_video_capturer_adapter.cc",
48 "webrtc_video_stream.cc", 54 "webrtc_video_stream.cc",
49 ] 55 ]
50 } 56 }
51 } 57 }
52 } 58 }
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 "video_frame_pump_unittest.cc", 127 "video_frame_pump_unittest.cc",
122 "webrtc_transport_unittest.cc", 128 "webrtc_transport_unittest.cc",
123 ] 129 ]
124 130
125 deps = [ 131 deps = [
126 ":test_support", 132 ":test_support",
127 "//testing/gmock", 133 "//testing/gmock",
128 "//testing/gtest", 134 "//testing/gtest",
129 ] 135 ]
130 } 136 }
OLDNEW
« no previous file with comments | « remoting/host/BUILD.gn ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698