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

Side by Side Diff: webrtc/api/BUILD.gn

Issue 2426563003: Moved transport.h from webrtc/ to webrtc/api, created build target and updated dependencies. (Closed)
Patch Set: Created 4 years, 2 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
OLDNEW
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 10 matching lines...) Expand all
21 rtc_source_set("call_api") { 21 rtc_source_set("call_api") {
22 sources = [ 22 sources = [
23 "call/audio_receive_stream.h", 23 "call/audio_receive_stream.h",
24 "call/audio_send_stream.h", 24 "call/audio_send_stream.h",
25 "call/audio_sink.h", 25 "call/audio_sink.h",
26 "call/audio_state.h", 26 "call/audio_state.h",
27 ] 27 ]
28 28
29 deps = [ 29 deps = [
30 # TODO(kjellander): Add remaining dependencies when webrtc:4243 is done. 30 # TODO(kjellander): Add remaining dependencies when webrtc:4243 is done.
31 ":transport_api",
31 "..:webrtc_common", 32 "..:webrtc_common",
32 "../base:rtc_base_approved", 33 "../base:rtc_base_approved",
33 "../modules/audio_coding:audio_encoder_interface", 34 "../modules/audio_coding:audio_encoder_interface",
34 ] 35 ]
35 } 36 }
36 37
37 config("libjingle_peerconnection_warnings_config") { 38 config("libjingle_peerconnection_warnings_config") {
38 # GN orders flags on a target before flags from configs. The default config 39 # GN orders flags on a target before flags from configs. The default config
39 # adds these flags so to cancel them out they need to come from a config and 40 # adds these flags so to cancel them out they need to come from a config and
40 # cannot be on the target directly. 41 # cannot be on the target directly.
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 "stats/rtcstats.h", 310 "stats/rtcstats.h",
310 "stats/rtcstats_objects.h", 311 "stats/rtcstats_objects.h",
311 "stats/rtcstatsreport.h", 312 "stats/rtcstatsreport.h",
312 ] 313 ]
313 314
314 deps = [ 315 deps = [
315 "../base:rtc_base_approved", 316 "../base:rtc_base_approved",
316 ] 317 ]
317 } 318 }
318 319
320 # GYP version: webrtc/api/api.gyp:transport_api
321 rtc_source_set("transport_api") {
ossu 2016/10/17 14:05:44 If transport.h is in api/call, shouldn't it be par
aleloi 2016/10/17 14:21:56 I'm not sure, but I think it shouldn't be merged w
the sun 2016/10/17 14:38:35 I was about to agree with Oskar first, but looking
ossu 2016/10/17 14:54:58 Alright. Should the file still be in call/ then? O
322 sources = [
323 "call/transport.h",
324 ]
325 }
326
319 if (rtc_include_tests) { 327 if (rtc_include_tests) {
320 config("peerconnection_unittests_config") { 328 config("peerconnection_unittests_config") {
321 # The warnings below are enabled by default. Since GN orders compiler flags 329 # 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 330 # 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. 331 # warnings is by having them in a separate config, loaded from the target.
324 # TODO(kjellander): Make the code compile without disabling these flags. 332 # TODO(kjellander): Make the code compile without disabling these flags.
325 # See https://bugs.webrtc.org/3307. 333 # See https://bugs.webrtc.org/3307.
326 if (is_clang && is_win) { 334 if (is_clang && is_win) {
327 cflags = [ 335 cflags = [
328 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6267 336 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6267
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 473
466 shared_libraries = [ ":libjingle_peerconnection_so" ] 474 shared_libraries = [ ":libjingle_peerconnection_so" ]
467 } 475 }
468 476
469 android_resources("libjingle_peerconnection_android_unittest_resources") { 477 android_resources("libjingle_peerconnection_android_unittest_resources") {
470 resource_dirs = [ "androidtests/res" ] 478 resource_dirs = [ "androidtests/res" ]
471 custom_package = "org.webrtc" 479 custom_package = "org.webrtc"
472 } 480 }
473 } 481 }
474 } 482 }
OLDNEW
« no previous file with comments | « webrtc/BUILD.gn ('k') | webrtc/api/api.gyp » ('j') | webrtc/api/call/transport.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698