Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2015 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 import("../build/webrtc.gni") | 9 import("../build/webrtc.gni") |
| 10 if (is_android) { | 10 if (is_android) { |
| (...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 334 rtc_source_set("audio_mixer_api") { | 334 rtc_source_set("audio_mixer_api") { |
| 335 sources = [ | 335 sources = [ |
| 336 "audio/audio_mixer.h", | 336 "audio/audio_mixer.h", |
| 337 ] | 337 ] |
| 338 | 338 |
| 339 deps = [ | 339 deps = [ |
| 340 "../base:rtc_base_approved", | 340 "../base:rtc_base_approved", |
| 341 ] | 341 ] |
| 342 } | 342 } |
| 343 | 343 |
| 344 rtc_source_set("video_frame_api") { | |
| 345 sources = [ | |
| 346 "video/rotation.h", | |
|
pthatcher1
2016/11/30 00:48:28
We have video/video_x.h for everything else. Woul
nisse-webrtc
2016/11/30 11:26:03
I'm renaming it video/video_rotation.h, for consis
| |
| 347 "video/video_frame.cc", | |
| 348 "video/video_frame.h", | |
| 349 "video/video_frame_buffer.h", | |
| 350 ] | |
| 351 | |
| 352 deps = [ | |
| 353 "../base:rtc_base_approved", | |
| 354 ] | |
| 355 } | |
| 356 | |
| 344 if (rtc_include_tests) { | 357 if (rtc_include_tests) { |
| 345 config("peerconnection_unittests_config") { | 358 config("peerconnection_unittests_config") { |
| 346 # The warnings below are enabled by default. Since GN orders compiler flags | 359 # The warnings below are enabled by default. Since GN orders compiler flags |
| 347 # for a target before flags from configs, the only way to disable such | 360 # for a target before flags from configs, the only way to disable such |
| 348 # warnings is by having them in a separate config, loaded from the target. | 361 # warnings is by having them in a separate config, loaded from the target. |
| 349 # TODO(kjellander): Make the code compile without disabling these flags. | 362 # TODO(kjellander): Make the code compile without disabling these flags. |
| 350 # See https://bugs.webrtc.org/3307. | 363 # See https://bugs.webrtc.org/3307. |
| 351 if (is_clang && is_win) { | 364 if (is_clang && is_win) { |
| 352 cflags = [ | 365 cflags = [ |
| 353 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6267 | 366 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6267 |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 486 deps = [ | 499 deps = [ |
| 487 ":libjingle_peerconnection_java", | 500 ":libjingle_peerconnection_java", |
| 488 "../base:base_java", | 501 "../base:base_java", |
| 489 "//base:base_java", | 502 "//base:base_java", |
| 490 ] | 503 ] |
| 491 | 504 |
| 492 shared_libraries = [ ":libjingle_peerconnection_so" ] | 505 shared_libraries = [ ":libjingle_peerconnection_so" ] |
| 493 } | 506 } |
| 494 } | 507 } |
| 495 } | 508 } |
| OLD | NEW |