Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license |
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source |
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found |
| 6 # in the file PATENTS. All contributing project authors may | 6 # in the file PATENTS. All contributing project authors may |
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. |
| 8 | 8 |
| 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. |
| 10 | 10 |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 224 libs = [ "Foundation.framework" ] | 224 libs = [ "Foundation.framework" ] |
| 225 } | 225 } |
| 226 | 226 |
| 227 rtc_source_set("video_stream_api") { | 227 rtc_source_set("video_stream_api") { |
| 228 sources = [ | 228 sources = [ |
| 229 "video_receive_stream.h", | 229 "video_receive_stream.h", |
| 230 "video_send_stream.h", | 230 "video_send_stream.h", |
| 231 ] | 231 ] |
| 232 } | 232 } |
| 233 | 233 |
| 234 # Contents of video_frame.h is moved from top-level down to common_video/. | |
| 235 # Nothing in webrtc includes the backwards-compatibility header, so this target | |
| 236 # is only for completeness. | |
| 237 # TODO(nisse): Delete together with the header file once downstream applications | |
| 238 # no longer use it. | |
| 239 rtc_source_set("video_frame_deprecated") { | |
| 240 sources = [ | |
| 241 "video_frame.h", | |
| 242 ] | |
| 243 } | |
|
kwiberg-webrtc
2017/05/15 07:27:04
Hmm. This source_set should have a dep on the targ
mbonadei
2017/05/15 07:31:56
Yes, you are right.
Gn is not catching this becau
nisse-webrtc
2017/05/15 08:32:55
Added dependency.
| |
| 244 | |
| 234 if (!build_with_chromium) { | 245 if (!build_with_chromium) { |
| 235 # Target to build all the WebRTC production code. | 246 # Target to build all the WebRTC production code. |
| 236 rtc_static_library("webrtc") { | 247 rtc_static_library("webrtc") { |
| 237 # Only the root target should depend on this. | 248 # Only the root target should depend on this. |
| 238 visibility = [ "//:default" ] | 249 visibility = [ "//:default" ] |
| 239 | 250 |
| 240 sources = [ | 251 sources = [ |
| 241 # TODO(ossu): Keep this here until donwstream projects have updated. | 252 # TODO(ossu): Keep this here until donwstream projects have updated. |
| 242 # http://bugs.webrtc.org/6716 | 253 # http://bugs.webrtc.org/6716 |
| 243 "call.h", | 254 "call.h", |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 512 ] | 523 ] |
| 513 | 524 |
| 514 deps = [ | 525 deps = [ |
| 515 "//base:base_java_test_support", | 526 "//base:base_java_test_support", |
| 516 "//webrtc/examples:AppRTCMobile_javalib", | 527 "//webrtc/examples:AppRTCMobile_javalib", |
| 517 "//webrtc/sdk/android:libjingle_peerconnection_java", | 528 "//webrtc/sdk/android:libjingle_peerconnection_java", |
| 518 ] | 529 ] |
| 519 } | 530 } |
| 520 } | 531 } |
| 521 } | 532 } |
| OLD | NEW |