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 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 309 "stats/rtcstats.h", | 309 "stats/rtcstats.h", |
| 310 "stats/rtcstats_objects.h", | 310 "stats/rtcstats_objects.h", |
| 311 "stats/rtcstatsreport.h", | 311 "stats/rtcstatsreport.h", |
| 312 ] | 312 ] |
| 313 | 313 |
| 314 deps = [ | 314 deps = [ |
| 315 "../base:rtc_base_approved", | 315 "../base:rtc_base_approved", |
| 316 ] | 316 ] |
| 317 } | 317 } |
| 318 | 318 |
| 319 # GYP version: webrtc/api/api.gyp:audio_mixer_api | |
| 320 rtc_source_set("audio_mixer_api") { | |
| 321 sources = [ | |
| 322 "audio/audio_mixer.h", | |
|
the sun
2016/10/12 15:26:10
The mixer has a dependency on AudioFrame, which is
aleloi
2016/10/12 15:36:02
There is no GN target yet for module_common_types.
the sun
2016/10/13 07:55:00
I think what you need to do is pull AudioFrame out
| |
| 323 ] | |
| 324 | |
| 325 deps = [ | |
| 326 "../base:rtc_base_approved", | |
| 327 ] | |
| 328 } | |
| 329 | |
| 319 if (rtc_include_tests) { | 330 if (rtc_include_tests) { |
| 320 config("peerconnection_unittests_config") { | 331 config("peerconnection_unittests_config") { |
| 321 # The warnings below are enabled by default. Since GN orders compiler flags | 332 # The warnings below are enabled by default. Since GN orders compiler flags |
| 322 # for a target before flags from configs, the only way to disable such | 333 # for a target before flags from configs, the only way to disable such |
| 323 # warnings is by having them in a separate config, loaded from the target. | 334 # warnings is by having them in a separate config, loaded from the target. |
| 324 # TODO(kjellander): Make the code compile without disabling these flags. | 335 # TODO(kjellander): Make the code compile without disabling these flags. |
| 325 # See https://bugs.webrtc.org/3307. | 336 # See https://bugs.webrtc.org/3307. |
| 326 if (is_clang && is_win) { | 337 if (is_clang && is_win) { |
| 327 cflags = [ | 338 cflags = [ |
| 328 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6267 | 339 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6267 |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 465 | 476 |
| 466 shared_libraries = [ ":libjingle_peerconnection_so" ] | 477 shared_libraries = [ ":libjingle_peerconnection_so" ] |
| 467 } | 478 } |
| 468 | 479 |
| 469 android_resources("libjingle_peerconnection_android_unittest_resources") { | 480 android_resources("libjingle_peerconnection_android_unittest_resources") { |
| 470 resource_dirs = [ "androidtests/res" ] | 481 resource_dirs = [ "androidtests/res" ] |
| 471 custom_package = "org.webrtc" | 482 custom_package = "org.webrtc" |
| 472 } | 483 } |
| 473 } | 484 } |
| 474 } | 485 } |
| OLD | NEW |