| 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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 "video_send_stream.h", | 230 "video_send_stream.h", |
| 231 ] | 231 ] |
| 232 deps = [ | 232 deps = [ |
| 233 ":webrtc_common", | 233 ":webrtc_common", |
| 234 "api:transport_api", | 234 "api:transport_api", |
| 235 "base:rtc_base_approved", | 235 "base:rtc_base_approved", |
| 236 "common_video:common_video", | 236 "common_video:common_video", |
| 237 ] | 237 ] |
| 238 } | 238 } |
| 239 | 239 |
| 240 # Contents of video_frame.h is moved from top-level down to common_video/. | |
| 241 # Nothing in webrtc includes the backwards-compatibility header, so this target | |
| 242 # is only for completeness. | |
| 243 # TODO(nisse): Delete together with the header file once downstream applications | |
| 244 # no longer use it. | |
| 245 rtc_source_set("video_frame_deprecated") { | |
| 246 sources = [ | |
| 247 "video_frame.h", | |
| 248 ] | |
| 249 deps = [ | |
| 250 "common_video", | |
| 251 ] | |
| 252 } | |
| 253 | |
| 254 if (!build_with_chromium) { | 240 if (!build_with_chromium) { |
| 255 # Target to build all the WebRTC production code. | 241 # Target to build all the WebRTC production code. |
| 256 rtc_static_library("webrtc") { | 242 rtc_static_library("webrtc") { |
| 257 # Only the root target should depend on this. | 243 # Only the root target should depend on this. |
| 258 visibility = [ "//:default" ] | 244 visibility = [ "//:default" ] |
| 259 | 245 |
| 260 sources = [] | 246 sources = [] |
| 261 complete_static_lib = true | 247 complete_static_lib = true |
| 262 defines = [] | 248 defines = [] |
| 263 | 249 |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 543 ] | 529 ] |
| 544 | 530 |
| 545 deps = [ | 531 deps = [ |
| 546 "//base:base_java_test_support", | 532 "//base:base_java_test_support", |
| 547 "//webrtc/examples:AppRTCMobile_javalib", | 533 "//webrtc/examples:AppRTCMobile_javalib", |
| 548 "//webrtc/sdk/android:libjingle_peerconnection_java", | 534 "//webrtc/sdk/android:libjingle_peerconnection_java", |
| 549 ] | 535 ] |
| 550 } | 536 } |
| 551 } | 537 } |
| 552 } | 538 } |
| OLD | NEW |